From 343c1eae228bfe4ec9b69e38313f9be502e438a7 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Tue, 22 May 2018 10:35:17 -0400 Subject: [PATCH] Hide status bar icons if showing bouncer on keyguard activity When in a keyguard activity, we want to hide the status bar icons when the status bar window is hidden or the bounce is showing. Test: launch camera from keyguard, press home to show bouncer, don't see icons Fixes: 80107240 Change-Id: I66dd923da2b63b20fd766f8223de90f19e86b36e --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 1b658b853f4bd..93e9cdff6f044 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -2090,7 +2090,8 @@ public class StatusBar extends SystemUI implements DemoMode, * @param animate should the change of the icons be animated. */ private void updateHideIconsForBouncer(boolean animate) { - boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded && mStatusBarWindowHidden; + boolean hideBecauseApp = mTopHidesStatusBar && mIsOccluded + && (mStatusBarWindowHidden || mBouncerShowing); boolean hideBecauseKeyguard = !mPanelExpanded && !mIsOccluded && mBouncerShowing; boolean shouldHideIconsForBouncer = hideBecauseApp || hideBecauseKeyguard; if (mHideIconsForBouncer != shouldHideIconsForBouncer) {