/android/export-contacts

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

« back to all changes in this revision

Viewing changes to res/layout/intro.xml

  • Committer: edam
  • Date: 2012-12-21 15:53:59 UTC
  • Revision ID: tim@ed.am-20121221155359-p8h3n0xhtulmwva0
fixed column values in Contacts backend; don't write-out empty notes; remember to close my queries; switched from wrappers to static valueOf() functions; fix line-endings (should be \r\n)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
28
        <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" >
29
 
                <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="6dp" android:paddingBottom="6dp">
 
29
                <LinearLayout android:layout_height="fill_parent" android:orientation="vertical" android:layout_width="fill_parent">
30
30
 
31
 
                        <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
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" />
34
 
                        </RelativeLayout>
 
31
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
35
32
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_summary" android:paddingBottom="10dp" />
36
33
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_help"/>
37
34
                        <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
 
                        <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" />
 
35
                        <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="10dp" android:paddingRight="20dp" android:paddingTop="4dp" android:paddingBottom="4dp" android:background="#555555" />
39
36
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/intro_licence" android:paddingTop="16dp" />
40
37
 
41
38
                </LinearLayout>
43
40
 
44
41
        <LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="right" android:background="@android:drawable/bottom_bar" android:weightSum="3">
45
42
                <Button android:id="@+id/back" android:text="@string/back" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false" />
46
 
                <Button android:id="@+id/next" android:text="@string/next" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false" />
 
43
                <Button android:id="@+id/next" android:text="@string/next" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false"/>
47
44
        </LinearLayout>
48
45
 
49
46
</LinearLayout>