diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-02 10:42:39 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-11-02 10:42:39 -0400 |
| commit | a9b468248dde3e9b6b1971e7c580b82a308820bd (patch) | |
| tree | bd6d53a912aaac665432c79f53c37ba8d5a2d169 /packages | |
| parent | bb5c941149b66c0192736468bb60f47984dd5e1f (diff) | |
| download | frameworks_base-a9b468248dde3e9b6b1971e7c580b82a308820bd.zip frameworks_base-a9b468248dde3e9b6b1971e7c580b82a308820bd.tar.gz frameworks_base-a9b468248dde3e9b6b1971e7c580b82a308820bd.tar.bz2 | |
Disable disable back if using an alternate back icon.
This enables the IME down chevron even if back would otherwise
be disabled.
Bug:7453424
Change-Id: Ia007df256124c617b86983bfe6958f790bd6a544
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 983328d..5eeef93 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -224,6 +224,8 @@ public class NavigationBarView extends LinearLayout { (0 != (hints & StatusBarManager.NAVIGATION_HINT_BACK_ALT)) ? (mVertical ? mBackAltLandIcon : mBackAltIcon) : (mVertical ? mBackLandIcon : mBackIcon)); + + setDisabledFlags(mDisabledFlags, true); } public void setDisabledFlags(int disabledFlags) { @@ -237,7 +239,8 @@ public class NavigationBarView extends LinearLayout { final boolean disableHome = ((disabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0); final boolean disableRecent = ((disabledFlags & View.STATUS_BAR_DISABLE_RECENT) != 0); - final boolean disableBack = ((disabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0); + final boolean disableBack = ((disabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0) + && ((mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) == 0); final boolean disableSearch = ((disabledFlags & View.STATUS_BAR_DISABLE_SEARCH) != 0); if (SLIPPERY_WHEN_DISABLED) { |