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

Commit 72a74076 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Passing activityClassName when setting unlock controller" into main

parents 576c7ff4 613254e6

quickstep/src/com/android/quickstep/SystemUiProxy.java

+7 −5
Original line number Diff line number Diff line
@@ -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;

    }