From be4e054cd35adefd99830a828f3b67e8fe8606ed Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 8 Aug 2019 16:36:14 -0700 Subject: Hide the home handle in lock task home when home and overview are disabled Bug: 137626984 Test: Verified the home handle is hidden with CtsVerifier app Change-Id: I0c21ae5b6f0d094e84b2ba4200a93fd9c4295a55 --- .../src/com/android/systemui/statusbar/phone/NavigationBarView.java | 5 +++++ 1 file changed, 5 insertions(+) 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 6bfa048eb63d..f689a3eadf58 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -619,6 +619,10 @@ public class NavigationBarView extends FrameLayout implements // Always disable recents when alternate car mode UI is active and for secondary displays. 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) || ((mDisabledFlags & View.STATUS_BAR_DISABLE_BACK) != 0)); @@ -649,6 +653,7 @@ public class NavigationBarView extends FrameLayout implements getBackButton().setVisibility(disableBack ? View.INVISIBLE : View.VISIBLE); getHomeButton().setVisibility(disableHome ? View.INVISIBLE : View.VISIBLE); getRecentsButton().setVisibility(disableRecent ? View.INVISIBLE : View.VISIBLE); + getHomeHandle().setVisibility(disableHomeHandle ? View.INVISIBLE : View.VISIBLE); } @VisibleForTesting -- cgit v1.2.3-59-g8ed1b