commit 0d96d6185d37911e17395b012afe0e6293285078
author Daisuke Miyakawa <dmiyakawa@google.com> Wed Sep 14 17:15:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 17:15:13 2011 -0700
tree 8344506d806640c2c5e383f933bed4574adb5186
parent 5793dd52e68637c266a1b546f6178c148795f59a
parent f75534bc07689443f9a9253242a473df64ecc2c3

Merge "Add correct content descriptions for favorite tab"

res/layout/contact_tile_starred_secondary_target.xml

diff --git a/res/layout/contact_tile_starred_secondary_target.xml b/res/layout/contact_tile_starred_secondary_target.xml
index 2ce59c5..27ef3a3 100644
--- a/res/layout/contact_tile_starred_secondary_target.xml
+++ b/res/layout/contact_tile_starred_secondary_target.xml
@@ -69,7 +69,8 @@
             android:paddingRight="8dip"
             android:paddingLeft="8dip"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true"
+            android:contentDescription="@string/description_view_contact_detail" />
 
     </RelativeLayout>
 

src/com/android/contacts/list/ContactTileView.java

diff --git a/src/com/android/contacts/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
index 137f6e7..cfac36e 100644
--- a/src/com/android/contacts/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -131,6 +131,12 @@
             } else {
                 Log.w(TAG, "contactPhotoManager not set");
             }
+
+            if (mPushState != null) {
+                mPushState.setContentDescription(entry.name);
+            } else if (mQuickContact != null) {
+                mQuickContact.setContentDescription(entry.name);
+            }
         } else {
             setVisibility(View.INVISIBLE);
         }