commit 71149ba5130583f74581f40190044cadf08d23ed
author Wenyi Wang <wenyiw@google.com> Wed Nov 11 21:55:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 11 21:55:51 2015 +0000
tree ca79c193ab970dd3afb4aada8b38ab4e2f44fb24
parent ef641ce27127326baebae9b220a874f00de1c97f
parent d0ac22fc7546537c55c5680e410ee4d1327df0fb

Merge "Fix for Talkback announcement of local contact photo in photo picker" into ub-contactsdialer-a-dev

src/com/android/contacts/editor/CompactPhotoSelectionFragment.java

diff --git a/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java b/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
index 0ce6ae7..930475e 100644
--- a/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
+++ b/src/com/android/contacts/editor/CompactPhotoSelectionFragment.java
@@ -95,7 +95,7 @@
         public int titleRes;
         public int iconRes;
         public String syncAdapterPackageName;
-        // Account type and user name of a photo
+
         public String accountType;
         public String accountName;
 
@@ -255,7 +255,7 @@
             final String contentDescription = getString(photo.primary ?
                     R.string.photo_view_description_checked :
                     R.string.photo_view_description_not_checked,
-                    photo.accountType, photo.accountName);
+                    photo.accountType, photo.accountName == null ? "" : photo.accountName);
             photoItemView.setContentDescription(contentDescription);
 
             return photoItemView;
@@ -347,7 +347,7 @@
         final ViewGroup clickedView = (ViewGroup) mGridView.getChildAt(position);
         final String contentDescription = getString(
                 R.string.photo_view_description_checked,
-                photo.accountType, photo.accountName);
+                photo.accountType, photo.accountName == null ? "" : photo.accountName);
         clickedView.announceForAccessibility(contentDescription);
     }