diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 a1cbba47e822..00d6f3a15c0f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -355,6 +355,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking) { + // Avoid having the shade and the bouncer open at the same time over a dream. + final boolean hideBouncerOverDream = + mDreamOverlayStateController.isOverlayActive() + && (mNotificationPanelViewController.isExpanded() + || mNotificationPanelViewController.isExpanding()); + // We don't want to translate the bounce when: // • Keyguard is occluded, because we're in a FLAG_SHOW_WHEN_LOCKED activity and need to // conserve the original animation. @@ -371,7 +377,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb return; } else if (bouncerNeedsScrimming()) { mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); - } else if (mShowing) { + } else if (mShowing && !hideBouncerOverDream) { if (!isWakeAndUnlocking() && !mCentralSurfaces.isInLaunchTransition() && !isUnlockCollapsing()) { |