/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/layout/intro.xml

  • Committer: Tim Marston
  • Date: 2014-03-01 17:36:18 UTC
  • Revision ID: tim@ed.am-20140301173618-vt1k4g5y6cs77oe5
fixed some lint warnings

Show diffs side-by-side

added added

removed removed

res/layout/intro.xml
25
25
 
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
27
27
 
28
 
        <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" >
29
 
                <LinearLayout android:layout_height="fill_parent" android:orientation="vertical" android:layout_width="fill_parent" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="6dp" android:paddingBottom="6dp">
 
28
        <ScrollView android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" >
 
29
                <LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_width="fill_parent" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="6dp" android:paddingBottom="6dp">
30
30
 
31
31
                        <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
32
32
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/intro_title" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_alignParentLeft="true" />
33
 
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/intro_version" android:gravity="right" android:layout_alignParentRight="true" />
 
33
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/intro_version" android:gravity="right" android:layout_alignParentRight="true" android:paddingRight="10dp" />
34
34
                        </RelativeLayout>
35
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_summary" android:paddingBottom="10dp" />
 
35
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_summary" android:paddingBottom="5dp" />
36
36
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_help"/>
37
37
                        <TextView android:id="@+id/intro_link" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_link" android:gravity="center" android:paddingBottom="18dp" />
38
38
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/intro_thanks" android:drawableRight="@drawable/family_pic" android:drawablePadding="10dp" android:paddingLeft="6dp" android:paddingRight="10dp" android:paddingTop="4dp" android:paddingBottom="4dp" android:background="#555555" />