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

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

Fix incorrect content description on action bar home/up 

Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.

Bug 10969992

Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70
parent efcc2ca6

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

+6 −14
Original line number Diff line number Diff line
@@ -566,7 +566,11 @@ public class ActionBarView extends AbsActionBarView { 
        mUpGoerFive.setEnabled(enable);

        mUpGoerFive.setFocusable(enable);

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

        if (!enable) {

        updateHomeAccessibility(enable);

    }



    private void updateHomeAccessibility(boolean homeEnabled) {

        if (!homeEnabled) {

            mUpGoerFive.setContentDescription(null);

            mUpGoerFive.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

        } else {
@@ -677,19 +681,7 @@ public class ActionBarView extends AbsActionBarView { 
        }



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

        if (!mHomeLayout.isEnabled()) {

            mHomeLayout.setContentDescription(null);

            mHomeLayout.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

        } else {

            mHomeLayout.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_AUTO);

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

            }

        }

        updateHomeAccessibility(!mUpGoerFive.isEnabled());

    }



    public void setIcon(Drawable icon) {