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

Merge "Hide the home handle in lock task home when home and overview are disabled" into qt-r1-dev

Browse Source 
am: 2862d538b6

Change-Id: Ied33a36a262ad766421321e9f4c53bb07a608fe7
This commit is contained in:
Sunny Goyal
2019-08-09 15:18:28 -07:00
committed by android-build-merger
parent 3fa31fb1cf 2862d538b6
commit ffe8886cd3
1 changed files with 5 additions and 0 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

@@ -619,6 +619,10 @@ public class NavigationBarView extends FrameLayout implements
// Always disable recents when alternate car mode UI is active and for secondary displays. // Always disable recents when alternate car mode UI is active and for secondary displays.
boolean disableRecent = isRecentsButtonDisabled(); boolean disableRecent = isRecentsButtonDisabled();
// Disable the home handle if both hone and recents are disabled
boolean disableHomeHandle = disableRecent
&& ((mDisabledFlags & View.STATUS_BAR_DISABLE_HOME) != 0);
boolean disableBack = !useAltBack && (isGesturalMode(mNavBarMode) boolean disableBack = !useAltBack && (isGesturalMode(mNavBarMode)
|| ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0)); || ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0));
@@ -649,6 +653,7 @@ public class NavigationBarView extends FrameLayout implements
getBackButton().setVisibility(disableBack ? View.INVISIBLE : View.VISIBLE); getBackButton().setVisibility(disableBack ? View.INVISIBLE : View.VISIBLE);
getHomeButton().setVisibility(disableHome ? View.INVISIBLE : View.VISIBLE); getHomeButton().setVisibility(disableHome ? View.INVISIBLE : View.VISIBLE);
getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE); getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE);
getHomeHandle().setVisibility(disableHomeHandle ? View.INVISIBLE : View.VISIBLE);
} }
@VisibleForTesting @VisibleForTesting