Merge "Prevent the bouncer from showing over dreams when swiping down the shade." into tm-dev (07c54de3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -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()) {