commit d0ac22fc7546537c55c5680e410ee4d1327df0fb
author Wenyi Wang <wenyiw@google.com> Wed Nov 11 13:06:50 2015 -0800
committer Wenyi Wang <wenyiw@google.com> Wed Nov 11 13:06:50 2015 -0800
tree 5e3409f23a08c8cb9366c827efe1050f9ec5d010
parent 96ed3c6f0c1c40b320d99e97c0243401dac3b3bc

Fix for Talkback announcement of local contact photo in photo picker

Bug: 25498370
Change-Id: I854165e5ffa374a709b06e5c9cd8fbce24263f56

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);
     }