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

Merge "Disable recents button in carmode inside of NavigationBarView, instead of doing it from PhoneWindowManager, which doesnt maintain the mUiMode properly and in sync with that in the UiModeManager. In addition the re-layout / modifications in the content of the navigation bar in care mode are better consolidated in one place instead of many places." into nyc-dev

Browse Source
This commit is contained in:
Sriram Viswanathan
2016-04-14 22:05:11 +00:00
committed by Android (Google) Code Review
parent 7c1f3905af 469caae9ea
commit 95a4791d1a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,7 +372,10 @@ public class NavigationBarView extends LinearLayout {
mDisabledFlags = disabledFlags;
final boolean disableHome = ((disabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);
boolean disableRecent = ((disabledFlags & View.STATUS_BAR_DISABLE_RECENT) != 0);
// Disable recents always in car mode.
boolean disableRecent = (
mCarMode || (disabledFlags & View.STATUS_BAR_DISABLE_RECENT) != 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);

4
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -7190,10 +7190,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
tmpVisibility &= ~PolicyControl.adjustClearableFlags(win, View.SYSTEM_UI_CLEARABLE_FLAGS);
}
if (mUiMode == Configuration.UI_MODE_TYPE_CAR) {
tmpVisibility |= StatusBarManager.DISABLE_RECENT;
}
final int fullscreenVisibility = updateLightStatusBarLw(0 /* vis */,
mTopFullscreenOpaqueWindowState, mTopFullscreenOpaqueOrDimmingWindowState);
final int dockedVisibility = updateLightStatusBarLw(0 /* vis */,