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

Commit ae3ee335 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Call StatusBar#finishKeyguardFadingAway after the fling animation."... 

Merge "Call StatusBar#finishKeyguardFadingAway after the fling animation." into sc-dev am: 821e005c

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

Change-Id: I5b65d83c4b73cd275b0e57fce3f096a8793ee84f
parents 2bfce27f 821e005c

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

+7 −0
Original line number Diff line number Diff line
@@ -591,6 +591,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


        if (mStatusBar.isInLaunchTransition()

                || mKeyguardStateController.isFlingingToDismissKeyguard()) {

            final boolean wasFlingingToDismissKeyguard =

                    mKeyguardStateController.isFlingingToDismissKeyguard();

            mStatusBar.fadeKeyguardAfterLaunchTransition(new Runnable() {

                @Override

                public void run() {
@@ -604,6 +606,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                public void run() {

                    mStatusBar.hideKeyguard();

                    mNotificationShadeWindowController.setKeyguardFadingAway(false);



                    if (wasFlingingToDismissKeyguard) {

                        mStatusBar.finishKeyguardFadingAway();

                    }



                    mViewMediatorCallback.keyguardGone();

                    executeAfterKeyguardGoneAction();

                }