commit d32a0baa88231115989a9e408917f57c33ea4dc5
author Eric Fischer <enf@google.com> Mon Nov 21 15:26:46 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 21 15:26:46 2011 -0800
tree 4f6a3d6410e0049a09d8a59c7423b76266b5fe45
parent 477366ac89828fcf85a94d63b76cda754a85d2ce
parent 579f4f2942bd10aea5640eb648003fa7b7daddf0

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

res/layout/contacts_unavailable_fragment.xml

diff --git a/res/layout/contacts_unavailable_fragment.xml b/res/layout/contacts_unavailable_fragment.xml
index 1abc020..9f28a55 100644
--- a/res/layout/contacts_unavailable_fragment.xml
+++ b/res/layout/contacts_unavailable_fragment.xml
@@ -62,12 +62,13 @@
                 android:layout_marginBottom="15dip"
                 android:text="@string/contacts_unavailable_add_account" />
 
+            <!-- TODO: Use a string that says "Import" instead of "Import/export contacts"-->
             <Button
                 android:id="@+id/import_contacts_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="15dip"
-                android:text="@string/contacts_unavailable_import_contacts" />
+                android:text="@string/dialog_import_export" />
 
             <Button
                 android:id="@+id/import_failure_uninstall_button"

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 800dc49..8d1b9aa 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1198,7 +1198,7 @@
 
         @Override
         public void onImportContactsFromFileAction() {
-            AccountSelectionUtil.doImportFromSdCard(PeopleActivity.this, null);
+            ImportExportDialogFragment.show(getFragmentManager());
         }
 
         @Override