From 613254e65709dfd2ba01a4025d3befda8a89eb68 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 28 Sep 2023 20:29:53 -0700 Subject: [PATCH] Passing activityClassName when setting unlock controller Bug: 302621267 Test: Presubmit Flag: N/A Change-Id: I84f9e404dc2e0654d38dd24c08e82fa5d103a067 --- .../src/com/android/quickstep/SystemUiProxy.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 3429df156c..419824a020 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -137,6 +137,7 @@ public class SystemUiProxy implements ISystemUiProxy { private ISplitSelectListener mSplitSelectListener; private IStartingWindowListener mStartingWindowListener; private ILauncherUnlockAnimationController mLauncherUnlockAnimationController; + private String mLauncherActivityClass; private IRecentTasksListener mRecentTasksListener; private IUnfoldTransitionListener mUnfoldAnimationListener; private IDesktopTaskListener mDesktopTaskListener; @@ -248,7 +249,8 @@ public class SystemUiProxy implements ISystemUiProxy { registerSplitScreenListener(mSplitScreenListener); registerSplitSelectListener(mSplitSelectListener); setStartingWindowListener(mStartingWindowListener); - setLauncherUnlockAnimationController(mLauncherUnlockAnimationController); + setLauncherUnlockAnimationController( + mLauncherActivityClass, mLauncherUnlockAnimationController); new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition); setupTransactionQueue(); registerRecentTasksListener(mRecentTasksListener); @@ -1109,11 +1111,11 @@ public class SystemUiProxy implements ISystemUiProxy { * changes). */ public void setLauncherUnlockAnimationController( - ILauncherUnlockAnimationController controller) { + String activityClass, ILauncherUnlockAnimationController controller) { if (mSysuiUnlockAnimationController != null) { try { - mSysuiUnlockAnimationController.setLauncherUnlockController(controller); - + mSysuiUnlockAnimationController.setLauncherUnlockController( + activityClass, controller); if (controller != null) { controller.dispatchSmartspaceStateToSysui(); } @@ -1121,7 +1123,7 @@ public class SystemUiProxy implements ISystemUiProxy { Log.w(TAG, "Failed call setLauncherUnlockAnimationController", e); } } - + mLauncherActivityClass = activityClass; mLauncherUnlockAnimationController = controller; }