/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: 2009-01-11 16:47:01 UTC
  • Revision ID: edam@waxworlds.org-20090111164701-tvnnv5axo6jd7ck0
- added GPL header comments to all files
- added GPLv3 to project as COPYING

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/mergeprompt.xml
32
32
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_merge" android:id="@+id/merge_merge" />
33
33
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/merge_overwrite" android:id="@+id/merge_overwrite" />
34
34
        <CheckBox android:id="@+id/mergeprompt_always" android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/mergeprompt_always" />
35
 
        <View android:layout_width="fill_parent" android:background="@android:drawable/divider_horizontal_dark" android:layout_marginBottom="10dip" android:layout_height="1dip"/>
36
 
        <Button android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="@string/abort" android:id="@+id/abort" />
37
35
 
38
36
</LinearLayout>