Merge "ContactsCommon: Display "Phone,SD card" instead of storage's path"

4 files changed, 12 insertions, 10 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a184aa82..66d3455b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -272,6 +272,8 @@
     <string name="copy_failure">复制失败！</string>
     <string name="card_no_space">卡记录已满，部分信息未复制</string>
     <string name="select_path">请选择路径</string>
+    <string name="sd_card">SD 卡</string>
+    <string name="phone_storage">手机内存</string>
     <string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string>
     <!-- Menu item used to initiate ip call -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e049c1d1..6e49a5f0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -833,5 +833,7 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
 
     <string name="Import_All">Import Contacts From All SIMs</string>
     <string name="select_path">Select Path</string>
+    <string name="sd_card">SD card</string>
+    <string name="phone_storage">Phone storage</string>
     <string name="select_sim">Select SIM</string>
 </resources>
diff --git a/src/com/android/contacts/common/vcard/ExportVCardActivity.java b/src/com/android/contacts/common/vcard/ExportVCardActivity.java
index 625412e8..36aa69dd 100644
--- a/src/com/android/contacts/common/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ExportVCardActivity.java
@@ -186,13 +186,12 @@ public class ExportVCardActivity extends Activity implements ServiceConnection,
         boolean sdExist = MoreContactUtils.sdCardExist(this);
         boolean inExist = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
         if (sdExist && inExist) {
-            CharSequence[] storage_list = new CharSequence[2];
-            storage_list[VCardService.INTERNAL_PATH] = Environment.getExternalStorageDirectory()
-                    .getPath();
-            storage_list[VCardService.EXTERNAL_PATH] = MoreContactUtils.getSDPath(this);
+            CharSequence[] storageNames = new CharSequence[2];
+            storageNames[VCardService.INTERNAL_PATH] = getString(R.string.phone_storage);
+            storageNames[VCardService.EXTERNAL_PATH] = getString(R.string.sd_card);
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.select_path);
-            builder.setSingleChoiceItems(storage_list, 0, new DialogInterface.OnClickListener() {
+            builder.setSingleChoiceItems(storageNames, 0, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     Log.d(LOG_TAG, "onClicked Dialog on which = " + which);
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index c8e6b236..fe8f3c92 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -906,13 +906,12 @@ public class ImportVCardActivity extends Activity {
         boolean sdExist = MoreContactUtils.sdCardExist(this);
         boolean inExist = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
         if (sdExist && inExist) {
-            CharSequence[] storage_list = new CharSequence[2];
-            storage_list[VCardService.INTERNAL_PATH] = Environment.getExternalStorageDirectory()
-                    .getPath();
-            storage_list[VCardService.EXTERNAL_PATH] = MoreContactUtils.getSDPath(this);
+            CharSequence[] storageNames = new CharSequence[2];
+            storageNames[VCardService.INTERNAL_PATH] = getString(R.string.phone_storage);
+            storageNames[VCardService.EXTERNAL_PATH] = getString(R.string.sd_card);
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.select_path);
-            builder.setSingleChoiceItems(storage_list, 0, new DialogInterface.OnClickListener() {
+            builder.setSingleChoiceItems(storageNames, 0, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     Log.d(LOG_TAG, "onClicked Dialog on which = " + which);