Modify content descriptions of star and search icon am: 7438b13a7f
am: 0779048c67
Change-Id: Ibccfe6947b1c3926207a5833980600e62471f50e
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index a2402b9..10a47ba 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -18,7 +18,7 @@
<item
android:id="@+id/menu_search"
android:icon="@drawable/ic_ab_search"
- android:title="@string/menu_search"
+ android:title="@string/hint_findContacts"
contacts:showAsAction="ifRoom" />
<item
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index 89068d0..6ed7178 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -18,6 +18,6 @@
<item
android:id="@+id/menu_search"
android:icon="@drawable/ic_ab_search"
- android:title="@string/menu_search"
+ android:title="@string/hint_findContacts"
contacts:showAsAction="always" />
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 05d6274..a50c155 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1683,9 +1683,6 @@
<!-- Toast indicating that no visible contact to share [CHAR LIMIT=NONE] -->
<string name="no_contact_to_share">There are no contacts to share.</string>
- <!-- Menu item to search contacts -->
- <string name="menu_search">Search</string>
-
<!-- The menu item to filter the list of contacts displayed -->
<string name="menu_contacts_filter">Contacts to display</string>
@@ -1701,12 +1698,7 @@
<!-- Query hint displayed inside the search field [CHAR LIMIT=64] -->
<string name="hint_findContacts">Search contacts</string>
- <!-- The description text for the favorites tab.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
-
- [CHAR LIMIT=NONE] -->
+ <!-- The content description text for star icon in contacts list [CHAR LIMIT=30] -->
<string name="contactsFavoritesLabel">Favorites</string>
<!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "All contacts" is selected [CHAR LIMIT=64]-->
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 6e742a3..d20c6e8 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -1035,7 +1035,7 @@
headerImageView.setImageTintList(ColorStateList.valueOf(getResources()
.getColor(R.color.material_star_pink)));
headerImageView.setContentDescription(
- getContext().getString(R.string.list_filter_all_starred));
+ getContext().getString(R.string.contactsFavoritesLabel));
headerImageView.setVisibility(View.VISIBLE);
addView(headerImageView);
}