From c516bac0b420fb2ca0c938a0b4a2207676d52ca2 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 19 Jun 2018 10:50:04 -0700 Subject: [PATCH] Simplify scrimmed bouncer condition Similar logic existed in StatusBar and StatusBarKeyguardViewManager, this can lead to errors since it's easy to update one place and forget about the other. Test: go/sysui-bouncer-tests Test: force simPin security mode Change-Id: I4a22cba5144844cf982f259da13db0c8effbeae6 --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 6 ++---- .../systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) 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 c70f03405db3..51b8c1389e8c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4722,10 +4722,8 @@ public class StatusBar extends SystemUI implements DemoMode, // Bouncer needs the front scrim when it's on top of an activity, // tapping on a notification, editing QS or being dismissed by // FLAG_DISMISS_KEYGUARD_ACTIVITY. - ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming() - || mStatusBarKeyguardViewManager.willDismissWithAction() - || mStatusBarKeyguardViewManager.isFullscreenBouncer() ? - ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER; + ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming() + ? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER; mScrimController.transitionTo(state); } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index fe863789ee96..f971621e5cc1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -170,8 +170,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb // • Full-screen user switcher is displayed. if (mNotificationPanelView.isUnlockHintRunning()) { mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN); - } else if (mOccluded || mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed() - || mStatusBar.isFullScreenUserSwitcherState()) { + } else if (bouncerNeedsScrimming()) { mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); } else if (mShowing && !mDozing) { if (!isWakeAndUnlocking()) { @@ -731,12 +730,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } } - public boolean willDismissWithAction() { - return mBouncer.willDismissWithAction(); - } - public boolean bouncerNeedsScrimming() { - return mBouncer.isShowingScrimmed(); + return mOccluded || mBouncer.willDismissWithAction() || mBouncer.needsFullscreenBouncer() + || mStatusBar.isFullScreenUserSwitcherState() || mBouncer.isShowingScrimmed(); } public void dump(PrintWriter pw) { -- 2.11.0