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

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

Merge "Add keyguardGoingAway to the state controller." into tm-dev am: 1254f916 

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



Change-Id: I28607456da601e3624a703fe2706a7945b7cdafe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85c44d91 1254f916

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Diff line number Diff line
@@ -2604,6 +2604,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 


            finishSurfaceBehindRemoteAnimation(cancelled);

            mSurfaceBehindRemoteAnimationRequested = false;



            // The remote animation is over, so we're not going away anymore.

            mKeyguardStateController.notifyKeyguardGoingAway(false);

        });



        mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(
@@ -2622,6 +2625,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
            ActivityTaskManager.getService().keyguardGoingAway(

                    WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS

                            | WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER);

            mKeyguardStateController.notifyKeyguardGoingAway(true);

        } catch (RemoteException e) {

            mSurfaceBehindRemoteAnimationRequested = false;

            e.printStackTrace();

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateController.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.policy;



import android.app.IActivityTaskManager;



import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.policy.KeyguardStateController.Callback;
@@ -233,6 +235,12 @@ public interface KeyguardStateController extends CallbackController<Callback> { 
         */

        default void onKeyguardFadingAwayChanged() {}



        /**

         * We've called {@link IActivityTaskManager#keyguardGoingAway}, which initiates the unlock

         * sequence.

         */

        default void onKeyguardGoingAwayChanged() {}



        /**

         * Triggered when the keyguard dismiss amount has changed, via either a swipe gesture or an

         * animation.

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum 
            Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardGoingAway",

                    keyguardGoingAway ? 1 : 0);

            mKeyguardGoingAway = keyguardGoingAway;

            new ArrayList<>(mCallbacks).forEach(Callback::onKeyguardGoingAwayChanged);

        }

    }