commit 7f4155b3eba851fe9ae92d16d59303ba84ecff19
author Wenyi Wang <wenyiw@google.com> Wed Jan 27 17:34:15 2016 -0800
committer Wenyi Wang <wenyiw@google.com> Wed Jan 27 19:35:20 2016 -0800
tree 84c9db9bdfff1c54829ed4e1a9df30cbd3f60aa8
parent 09792f623907f10ef18103651c144da79bd7caff

Use proper strings for different "share" options

Bug: 22083005
Bug: 21640772

Change-Id: I2f526aa208ef40c09739498ea3a3f21e71f7cf76

src/com/android/contacts/common/interactions/ImportExportDialogFragment.java

diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 6343e76..7e64190 100644
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -168,10 +168,16 @@
                         R.string.export_to_vcf_file));
             }
         }
-        if (res.getBoolean(R.bool.config_allow_share_visible_contacts)) {
-            if (contactsAreAvailable) {
-                adapter.add(new AdapterEntry(getString(R.string.share_visible_contacts),
-                        R.string.share_visible_contacts));
+        if (res.getBoolean(R.bool.config_allow_share_contacts) && contactsAreAvailable) {
+            if (mExportMode == EXPORT_MODE_FAVORITES) {
+                // share "visible" contacts (favorite and frequent contacts) from Favorites tab
+                adapter.add(new AdapterEntry(getString(R.string.share_favorite_contacts),
+                        R.string.share_contacts));
+            } else {
+                // share "all" contacts (in groups selected in "Customize") from All tab for now
+                // TODO: change the string to share_visible_contacts if implemented
+                adapter.add(new AdapterEntry(getString(R.string.share_contacts),
+                        R.string.share_contacts));
             }
         }
 
@@ -196,9 +202,9 @@
                         getActivity().startActivity(exportIntent);
                         break;
                     }
-                    case R.string.share_visible_contacts: {
+                    case R.string.share_contacts: {
                         dismissDialog = true;
-                        doShareVisibleContacts();
+                        doShareContacts();
                         break;
                     }
                     default: {
@@ -220,7 +226,7 @@
                 .create();
     }
 
-    private void doShareVisibleContacts() {
+    private void doShareContacts() {
         try {
             // TODO move the query into a loader and do this in a background thread
             final Cursor cursor;
@@ -261,8 +267,8 @@
                 }
             }
         } catch (Exception e) {
-            Log.e(TAG, "Sharing visible contacts failed", e);
-            Toast.makeText(getContext(), R.string.share_visible_contacts_failure,
+            Log.e(TAG, "Sharing contacts failed", e);
+            Toast.makeText(getContext(), R.string.share_contacts_failure,
                     Toast.LENGTH_SHORT).show();
         }
     }