/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-28 19:55:17 UTC
  • Revision ID: edam@waxworlds.org-20090128195517-z1rmmys8tc8zvgqe
- made behaviour of next button overridable
- added abort button to merge prompt
- moved begin and close buttons to the next button, iverriding its behaviour
- added abort button to import and wired it up
- bugfix: tmp-progress bar didn't fill up when progress max was changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
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" />
35
37
 
36
38
</LinearLayout>