commit 3be4d060e3d7f7f0638c04b701f304070d266c62
author Sean Liu <guanxiongliu@google.com> Wed Feb 24 18:12:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 24 18:12:26 2016 +0000
tree c1abf9fd77ef0f8c792c045595067abd1b3a3d1b
parent 38fd9f56b282b45a0e66b31ee231ca367dc2d155
parent 13d38cc9d72edc060e16919d1fa1176e9323ff33

Merge "Adding speakable description for checkbox" into nyc-dev
am: 13d38cc9d7

* commit '13d38cc9d72edc060e16919d1fa1176e9323ff33':
  Adding speakable description for checkbox

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 5e00bfe..6aac921 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -595,6 +595,10 @@
                 new int[] { -android.R.attr.state_checked }
         };
         final int[] colors = new int[] { mColorFilterColor, mColorFilterColor };
+        if (suggestion != null && suggestion.name != null) {
+            checkbox.setContentDescription(suggestion.name + " " +
+                    getResources().getString(R.string.contact_from_account_name, accountName));
+        }
         checkbox.setButtonTintList(new ColorStateList(stateSet, colors));
         checkbox.setChecked(mSuggestionsShouldAutoSelected ||
                 mSelectedAggregationIds.contains(suggestion.contactId));