drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev

Browse Source 
* commit 'b611eb94e992390dde302124795e18f537aea017':
  Fix incorrect content description on action bar home/up
This commit is contained in:
Adam Powell
2013-11-04 10:01:43 -08:00
committed by Android Git Automerger
parent 7900702693 b611eb94e9
commit 9382a07161
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,11 @@ public class ActionBarView extends AbsActionBarView {
mUpGoerFive.setEnabled(enable); mUpGoerFive.setEnabled(enable);
mUpGoerFive.setFocusable(enable); mUpGoerFive.setFocusable(enable);
// Make sure the home button has an accurate content description for accessibility. // 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.setContentDescription(null);
mUpGoerFive.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); mUpGoerFive.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
} else { } else {
@ -677,19 +681,7 @@ public class ActionBarView extends AbsActionBarView {
} }
// Make sure the home button has an accurate content description for accessibility. // Make sure the home button has an accurate content description for accessibility.
if (!mHomeLayout.isEnabled()) { updateHomeAccessibility(!mUpGoerFive.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));
}
}
} }
public void setIcon(Drawable icon) { public void setIcon(Drawable icon) {