am c991bf90: am 086370c9: am 2229ca03: Fix an action bar accessibility regression (34ccdf2d) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -526,7 +526,7 @@ public class ActionBarView extends AbsActionBarView {
		if (mLogoNavItem != null) {
		mLogoNavItem.setTitle(title);
		}
		mUpGoerFive.setContentDescription(buildHomeContentDescription());
		updateHomeAccessibility(mUpGoerFive.isEnabled());
		}

		public CharSequence getSubtitle() {
		@@ -544,7 +544,7 @@ public class ActionBarView extends AbsActionBarView {
		(!TextUtils.isEmpty(mTitle) \|\| !TextUtils.isEmpty(mSubtitle));
		mTitleLayout.setVisibility(visible ? VISIBLE : GONE);
		}
		mUpGoerFive.setContentDescription(buildHomeContentDescription());
		updateHomeAccessibility(mUpGoerFive.isEnabled());
		}

		public void setHomeButtonEnabled(boolean enable) {
		@@ -681,7 +681,7 @@ public class ActionBarView extends AbsActionBarView {
		}

		// Make sure the home button has an accurate content description for accessibility.
		updateHomeAccessibility(!mUpGoerFive.isEnabled());
		updateHomeAccessibility(mUpGoerFive.isEnabled());
		}

		public void setIcon(Drawable icon) {
		@@ -1332,11 +1332,13 @@ public class ActionBarView extends AbsActionBarView {

		public void setHomeActionContentDescription(CharSequence description) {
		mHomeDescription = description;
		updateHomeAccessibility(mUpGoerFive.isEnabled());
		}

		public void setHomeActionContentDescription(int resId) {
		mHomeDescriptionRes = resId;
		mHomeDescription = resId != 0 ? getResources().getText(resId) : null;
		updateHomeAccessibility(mUpGoerFive.isEnabled());
		}

		static class SavedState extends BaseSavedState {