Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc21d5d0 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Prevent the bouncer from showing over dreams when swiping down the... 

Merge "Prevent the bouncer from showing over dreams when swiping down the shade." into tm-dev am: 07c54de3 am: 11cbe13f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17505165



Change-Id: If2e35459a006670a04262019bf0fa881972c9b39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50c004e0 11cbe13f

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()) {