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

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

Merge "Don't reset the keyguard on occlusion if it's going away." into... 

Merge "Don't reset the keyguard on occlusion if it's going away." into tm-d1-dev am: f50462e6 am: 9f8a5c02 am: 211baf76

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



Change-Id: Id928270679526e46da01002deb5d67440cfc33eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79e7d20f 211baf76

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

+4 −2
Original line number Diff line number Diff line
@@ -739,8 +739,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

        mNotificationShadeWindowController.setKeyguardOccluded(mOccluded);



        // setDozing(false) will call reset once we stop dozing.

        if (!mDozing) {

        // setDozing(false) will call reset once we stop dozing. Also, if we're going away, there's

        // no need to reset the keyguard views as we'll be gone shortly. Resetting now could cause

        // unexpected visible behavior if the keyguard is still visible as we're animating unlocked.

        if (!mDozing && !mKeyguardStateController.isKeyguardGoingAway()) {

            // If Keyguard is reshown, don't hide the bouncer as it might just have been requested

            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            reset(isOccluding /* hideBouncerWhenShowing*/);