Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91a88bdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Modify content descriptions of star and search icon" into ub-contactsdialer-h-dev

parents 94fc608c 7438b13a

res/menu/people_options.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

res/menu/search_menu.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

res/values/strings.xml

+1 −9
Original line number Diff line number Diff line
@@ -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]-->

src/com/android/contacts/common/list/ContactListItemView.java

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ public class ContactListItemView extends ViewGroup 
        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);

    }