commit 56830932012b849722360327bf776a501ebb8c01
author Baligh Uddin <baligh@google.com> Thu Aug 22 18:12:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 22 18:12:46 2013 +0000
tree b4b01183614536fc95fdb152d699a3397cbadc9e
parent 896bbcceaf3d6b1a15adaaec04f2a20fb5a54242
parent 0d7e67775c604cfc78fc8054b140c5aec13bc9e6

Merge "Import translations. DO NOT MERGE"

src/com/android/contacts/detail/ContactDetailFragment.java

diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index ee2df1c..e48d248 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -89,6 +89,7 @@
 import com.android.contacts.common.model.account.AccountWithDataSet;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
+import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.contacts.model.Contact;
 import com.android.contacts.model.RawContact;
 import com.android.contacts.model.RawContactDelta;
@@ -592,7 +593,8 @@
                         entry.intent = phoneIntent;
                         entry.secondaryIntent = smsIntent;
                         entry.secondaryActionIcon = kind.iconAltRes;
-                        entry.secondaryActionDescription = kind.iconAltDescriptionRes;
+                        entry.secondaryActionDescription =
+                            ContactDisplayUtils.getSmsLabelResourceId(entry.type);
                     } else if (mHasPhone) {
                         entry.intent = phoneIntent;
                     } else if (mHasSms) {
@@ -1728,7 +1730,13 @@
             String secondaryActionDescription = null;
             if (entry.secondaryActionIcon != -1) {
                 secondaryActionIcon = resources.getDrawable(entry.secondaryActionIcon);
-                secondaryActionDescription = resources.getString(entry.secondaryActionDescription);
+                if (ContactDisplayUtils.isCustomPhoneType(entry.type)) {
+                    secondaryActionDescription = resources.getString(
+                            entry.secondaryActionDescription, entry.typeString);
+                } else {
+                    secondaryActionDescription = resources.getString(
+                            entry.secondaryActionDescription);
+                }
             } else if ((entry.chatCapability & Im.CAPABILITY_HAS_CAMERA) != 0) {
                 secondaryActionIcon =
                         resources.getDrawable(R.drawable.sym_action_videochat_holo_light);

src/com/android/contacts/detail/ContactLoaderFragment.java

diff --git a/src/com/android/contacts/detail/ContactLoaderFragment.java b/src/com/android/contacts/detail/ContactLoaderFragment.java
index 4ceebc6..0d4285f 100644
--- a/src/com/android/contacts/detail/ContactLoaderFragment.java
+++ b/src/com/android/contacts/detail/ContactLoaderFragment.java
@@ -259,16 +259,24 @@
         }
 
         final MenuItem editMenu = menu.findItem(R.id.menu_edit);
-        editMenu.setVisible(mOptionsMenuEditable);
+        if (editMenu != null) {
+            editMenu.setVisible(mOptionsMenuEditable);
+        }
 
         final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
-        deleteMenu.setVisible(mOptionsMenuEditable);
+        if (deleteMenu != null) {
+            deleteMenu.setVisible(mOptionsMenuEditable);
+        }
 
         final MenuItem shareMenu = menu.findItem(R.id.menu_share);
-        shareMenu.setVisible(mOptionsMenuShareable);
+        if (shareMenu != null) {
+            shareMenu.setVisible(mOptionsMenuShareable);
+        }
 
         final MenuItem createContactShortcutMenu = menu.findItem(R.id.menu_create_contact_shortcut);
-        createContactShortcutMenu.setVisible(mOptionsMenuCanCreateShortcut);
+        if (createContactShortcutMenu != null) {
+            createContactShortcutMenu.setVisible(mOptionsMenuCanCreateShortcut);
+        }
     }
 
     public boolean isContactOptionsChangeEnabled() {