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

Commit 203aa72e authored by Casey Burkhardt's avatar Casey Burkhardt Committed by Android (Google) Code Review
Browse files

Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev

parents a934ad11 8452a7f2

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

+16 −14
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ public class ActionBarView extends AbsActionBarView { 
        if (mLogoNavItem != null) {

            mLogoNavItem.setTitle(title);

        }

        mUpGoerFive.setContentDescription(buildHomeContentDescription());

    }



    public CharSequence getSubtitle() {
@@ -569,6 +570,7 @@ public class ActionBarView extends AbsActionBarView { 
                    (!TextUtils.isEmpty(mTitle) || !TextUtils.isEmpty(mSubtitle));

            mTitleLayout.setVisibility(visible ? VISIBLE : GONE);

        }

        mUpGoerFive.setContentDescription(buildHomeContentDescription());

    }



    public void setHomeButtonEnabled(boolean enable) {