/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: 2011-06-04 13:16:20 UTC
  • Revision ID: edam@waxworlds.org-20110604131620-hean9j66r3f5i72h
- fix UTF-8 unencoding by default on v3.0 vCards
- proper unescaping of strings in v3.0 vCards (also works for v2.1, although the 2.1 specs don't mention it)

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 -->
 
24
-->
25
25
 
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
 
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>