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

Commit 117316a0 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge changes I7c48a326,I7395ecd4 into pi-dev am: 4e4b6ff5 

am: b0683619

Change-Id: I5c9494641ddad266f211789dd50af240b4831858
parents d68c29a6 b0683619

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

+6 −5
Original line number Diff line number Diff line
@@ -165,14 +165,15 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        // • The user quickly taps on the display and we show "swipe up to unlock."

        // • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY

        // • Full-screen user switcher is displayed.

        if (mOccluded || mNotificationPanelView.isUnlockHintRunning()

                || mBouncer.willDismissWithAction()

        if (mNotificationPanelView.isUnlockHintRunning()) {

            mBouncer.setExpansion(1);

        } else if (mOccluded || mBouncer.willDismissWithAction()

                || mStatusBar.isFullScreenUserSwitcherState()) {

            mBouncer.setExpansion(0);

        } else if (mShowing && mStatusBar.isKeyguardCurrentlySecure() && !mDozing) {

        } else if (mShowing && !mDozing) {

            mBouncer.setExpansion(expansion);

            if (expansion != 1 && tracking && !mBouncer.isShowing()

                    && !mBouncer.isAnimatingAway()) {

            if (expansion != 1 && tracking && mStatusBar.isKeyguardCurrentlySecure()

                    && !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) {

                mBouncer.show(false /* resetSecuritySelection */, false /* animated */);

            }

        }