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

Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev

Browse Source
This commit is contained in:
Casey Burkhardt
2017-03-29 01:05:33 +00:00
committed by Android (Google) Code Review
parent 438be2af18 2464dc9a6a
commit 684607f7f6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -417,7 +417,10 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
getHomeButton().setImageDrawable(mHomeDefaultIcon); getHomeButton().setImageDrawable(mHomeDefaultIcon);
} }
final boolean showImeButton = ((hints & StatusBarManager.NAVIGATION_HINT_IME_SHOWN) != 0); // The Accessibility button always overrides the appearance of the IME switcher
final boolean showImeButton =
!mShowAccessibilityButton && ((hints & StatusBarManager.NAVIGATION_HINT_IME_SHOWN)
!= 0);
getImeSwitchButton().setVisibility(showImeButton ? View.VISIBLE : View.INVISIBLE); getImeSwitchButton().setVisibility(showImeButton ? View.VISIBLE : View.INVISIBLE);
getImeSwitchButton().setImageDrawable(mImeIcon); getImeSwitchButton().setImageDrawable(mImeIcon);
@@ -545,8 +548,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
mShowAccessibilityButton = visible; mShowAccessibilityButton = visible;
mLongClickableAccessibilityButton = longClickable; mLongClickableAccessibilityButton = longClickable;
if (visible) { if (visible) {
// Accessibility button overrides Menu button. // Accessibility button overrides Menu and IME switcher buttons.
setMenuVisibility(false, true); setMenuVisibility(false, true);
getImeSwitchButton().setVisibility(View.INVISIBLE);
} }
getAccessibilityButton().setVisibility(visible ? View.VISIBLE : View.INVISIBLE); getAccessibilityButton().setVisibility(visible ? View.VISIBLE : View.INVISIBLE);