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

Commit d9ad188a authored by Casey Burkhardt's avatar Casey Burkhardt Committed by Android Git Automerger
Browse files

am dd7d8ec1: am 203aa72e: Merge "Rebuilds ActionBar accessibility description... 

am dd7d8ec1: am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev

* commit 'dd7d8ec1':
  Rebuilds ActionBar accessibility description as needed
parents 70631fa4 dd7d8ec1

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