commit a2b77d3fa44c3aae75869cf0892086b6558df3a3
author Wenyi Wang <wenyiw@google.com> Wed Feb 24 21:42:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 21:42:39 2016 +0000
tree 472767fd3701060ff2be8ce14a799bd6de415961
parent de3d5fddb200e17767c4f4ffbc578c9467e4fc25
parent 6ad8269f7292a44a5414c38ab7c6c80379dcfcdb

Merge "Change minSdkVersion of ContactsTests to 21" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2eb1a3..111f275 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10402"
-    android:versionName="1.4.2">
+    android:versionCode="10403"
+    android:versionName="1.4.3">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23" />
     <original-package android:name="com.android.contacts" />

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