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

Commit f3cd1d95 authored by Adam Powell's avatar Adam Powell
Browse files

Bug 4269063 - Populate contentdescription in action bar 

home/up and action menu

Change-Id: Ia09d78d9d37848621e025b9af93a92cfd3bb8dc7
parent e4098519

core/java/com/android/internal/widget/ActionBarView.java

+13 −2
Original line number Diff line number Diff line
@@ -390,8 +390,8 @@ public class ActionBarView extends AbsActionBarView { 
            mHomeLayout.setVisibility(vis);



            if ((flagsChanged & ActionBar.DISPLAY_HOME_AS_UP) != 0) {

                mHomeAsUpView.setVisibility((options & ActionBar.DISPLAY_HOME_AS_UP) != 0

                        ? VISIBLE : GONE);

                final boolean isUp = (options & ActionBar.DISPLAY_HOME_AS_UP) != 0;

                mHomeAsUpView.setVisibility(isUp ? VISIBLE : GONE);

            }



            if ((flagsChanged & ActionBar.DISPLAY_USE_LOGO) != 0) {
@@ -419,6 +419,17 @@ public class ActionBarView extends AbsActionBarView { 
        } else {

            invalidate();

        }



        // Make sure the home button has an accurate content description for accessibility.

        if ((options & ActionBar.DISPLAY_DISABLE_HOME) != 0) {

            mHomeLayout.setContentDescription(null);

        } else if ((options & ActionBar.DISPLAY_HOME_AS_UP) != 0) {

            mHomeLayout.setContentDescription(mContext.getResources().getText(

                    R.string.action_bar_up_description));

        } else {

            mHomeLayout.setContentDescription(mContext.getResources().getText(

                    R.string.action_bar_home_description));

        }

    }



    public void setIcon(Drawable icon) {

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2815,4 +2815,10 @@ 
    <!-- Description of the button to decrement the NumberPicker value. [CHAR LIMIT=NONE] -->

    <string name="number_picker_decrement_button">Decrement</string>



    <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->

    <string name="action_bar_home_description">Navigate home</string>

    <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->

    <string name="action_bar_up_description">Navigate up</string>

    <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->

    <string name="action_menu_overflow_description">More options</string>

</resources>

core/res/res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ 


    <style name="Widget.ActionButton.Overflow">

        <item name="android:src">@drawable/ic_menu_more</item>

        <item name="android:contentDescription">@string/more_item_label</item>

        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>



    <style name="Widget.ActionButton.CloseMode">
@@ -1778,6 +1778,7 @@ 
        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>



    <style name="Widget.Holo.ActionButton.TextButton" parent="Widget.Holo.ButtonBar.Button">
@@ -2112,6 +2113,7 @@ 
        <item name="android:src">@android:drawable/ic_menu_moreoverflow_holo_light</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

        <item name="android:contentDescription">@string/action_menu_overflow_description</item>

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabView" parent="Widget.Holo.ActionBarView_TabView">