/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/mergeprompt.xml

  • Committer: edam
  • Date: 2012-12-21 14:51:26 UTC
  • Revision ID: tim@ed.am-20121221145126-l30l0yii8xkqs1m2
added a new class to VcardImporter, a ContentLine, which represents the data returned by the ContentLineIterator (including whether the next line looks folded, and the ability to generate/cache a US-ASCII String of the line)

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/mergeprompt.xml
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="20dp" android:paddingRight="20dp">
27
27
 
28
28
        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mergeprompt_help" />
29
 
        <TextView android:layout_height="wrap_content" android:id="@+id/mergeprompt_name" android:textStyle="bold" android:gravity="center" android:layout_width="fill_parent" android:paddingBottom="10dp" />
 
29
        <TextView android:layout_height="wrap_content" android:id="@+id/mergeprompt_name" android:textStyle="bold" android:gravity="center" android:layout_width="fill_parent"/>
 
30
        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
30
31
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/merge_keep" android:text="@string/merge_keep"/>
31
32
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_merge" android:id="@+id/merge_merge" />
32
33
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_overwrite" android:id="@+id/merge_overwrite" />