Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2229ca03: Fix an action bar accessibility regression

Browse Source 
* commit '2229ca031a326491feea5832e5337e9f8a602dca':
  Fix an action bar accessibility regression
This commit is contained in:
Adam Powell
2013-11-12 17:05:56 -08:00
committed by Android Git Automerger
parent 679ba4e86e 2229ca031a
commit 086370c971
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/widget/ActionBarView.java
View File

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