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

Commit fb5ca975 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't show the bouncer onPanelExpansionChanged when dozing + not... 

Merge "Don't show the bouncer onPanelExpansionChanged when dozing + not pulsing" into tm-dev am: d70a79df am: aa82ab2b

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



Change-Id: I6bc144e0cccc693ab6f4c92fb764645977991c5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cbc9a42 aa82ab2b

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

+4 −1
Original line number Diff line number Diff line
@@ -364,12 +364,15 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                        || mNotificationPanelViewController.isExpanding());



        // We don't want to translate the bounce when:

        // • device is dozing and not pulsing

        // • Keyguard is occluded, because we're in a FLAG_SHOW_WHEN_LOCKED activity and need to

        //   conserve the original animation.

        // • 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 (mNotificationPanelViewController.isUnlockHintRunning()) {

        if (mDozing && !mPulsing) {

            return;

        } else if (mNotificationPanelViewController.isUnlockHintRunning()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

        } else if (mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED

                && mKeyguardUpdateManager.isUdfpsEnrolled()) {