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

Commit 0602f802 authored by Evan Rosky's avatar Evan Rosky
Browse files

Move recents animation controller to shell 

Since recents animation controller is moved to shell, we
no-longer package a RemoteTransition with the intent
options.

Bug: 269691848
Test: existing tests pass. This is mostly moving logic.
Change-Id: I37df892fbc81e6af91173af9b7e6b80825311b0f
parent 4202d43e

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

+55 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; 
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;





import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.app.PictureInPictureParams;

import android.app.PictureInPictureParams;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -38,6 +39,8 @@ import android.os.Message; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.Log;

import android.util.Log;

import android.view.IRecentsAnimationController;

import android.view.IRecentsAnimationRunner;

import android.view.IRemoteAnimationRunner;

import android.view.IRemoteAnimationRunner;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationAdapter;
@@ -45,6 +48,7 @@ import android.view.RemoteAnimationTarget; 
import android.view.SurfaceControl;

import android.view.SurfaceControl;

import android.window.IOnBackInvokedCallback;

import android.window.IOnBackInvokedCallback;

import android.window.RemoteTransition;

import android.window.RemoteTransition;

import android.window.TaskSnapshot;

import android.window.TransitionFilter;

import android.window.TransitionFilter;





import androidx.annotation.Nullable;

import androidx.annotation.Nullable;
@@ -55,6 +59,9 @@ import com.android.internal.util.ScreenshotRequest; 
import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.launcher3.util.SplitConfigurationOptions;

import com.android.launcher3.util.SplitConfigurationOptions;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.recents.model.ThumbnailData;

import com.android.systemui.shared.system.RecentsAnimationControllerCompat;

import com.android.systemui.shared.system.RecentsAnimationListener;

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController;

import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController;

import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController;

import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationController;

import com.android.systemui.shared.system.smartspace.SmartspaceState;

import com.android.systemui.shared.system.smartspace.SmartspaceState;
@@ -135,9 +142,20 @@ public class SystemUiProxy implements ISystemUiProxy { 
    // TODO(141886704): Find a way to remove this

    // TODO(141886704): Find a way to remove this

    private int mLastSystemUiStateFlags;

    private int mLastSystemUiStateFlags;





    /**

     * This is a singleton pending intent that is used to start recents via Shell (which is a

     * different process). It is bare-bones, so it's expected that the component and options will

     * be provided via fill-in intent.

     */

    private final PendingIntent mRecentsPendingIntent;



    public SystemUiProxy(Context context) {

    public SystemUiProxy(Context context) {

        mContext = context;

        mContext = context;

        mAsyncHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessageAsync);

        mAsyncHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::handleMessageAsync);

        final Intent baseIntent = new Intent().setPackage(mContext.getPackageName());

        mRecentsPendingIntent = PendingIntent.getActivity(mContext, 0, baseIntent,

                PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT

                        | Intent.FILL_IN_COMPONENT);

    }

    }





    @Override

    @Override
@@ -1079,4 +1097,41 @@ public class SystemUiProxy implements ISystemUiProxy { 
            Log.e(TAG, "Failed call setUnfoldAnimationListener", e);

            Log.e(TAG, "Failed call setUnfoldAnimationListener", e);

        }

        }

    }

    }





    /**

     * Starts the recents activity. The caller should manage the thread on which this is called.

     */

    public boolean startRecentsActivity(Intent intent, ActivityOptions options,

            RecentsAnimationListener listener) {

        final IRecentsAnimationRunner runner = new IRecentsAnimationRunner.Stub() {

            @Override

            public void onAnimationStart(IRecentsAnimationController controller,

                    RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,

                    Rect homeContentInsets, Rect minimizedHomeBounds) {

                listener.onAnimationStart(new RecentsAnimationControllerCompat(controller), apps,

                        wallpapers, homeContentInsets, minimizedHomeBounds);

            }



            @Override

            public void onAnimationCanceled(int[] taskIds, TaskSnapshot[] taskSnapshots) {

                listener.onAnimationCanceled(

                        ThumbnailData.wrap(taskIds, taskSnapshots));

            }



            @Override

            public void onTasksAppeared(RemoteAnimationTarget[] apps) {

                listener.onTasksAppeared(apps);

            }

        };

        final Bundle optsBundle = options.toBundle();

        try {

            mRecentTasks.startRecentsTransition(mRecentsPendingIntent, intent, optsBundle,

                    mContext.getIApplicationThread(), runner);

        } catch (RemoteException e) {

            Log.e(TAG, "Error starting recents via shell", e);

            return false;

        }

        return true;

    }

}
 
}

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; 
import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;

import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED;

import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;

import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;

import static com.android.systemui.shared.system.RemoteTransitionCompat.newRemoteTransition;





import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ActivityOptions;
@@ -31,7 +30,6 @@ import android.content.Intent; 
import android.os.SystemProperties;

import android.os.SystemProperties;

import android.util.Log;

import android.util.Log;

import android.view.RemoteAnimationTarget;

import android.view.RemoteAnimationTarget;

import android.window.RemoteTransition;





import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.UiThread;

import androidx.annotation.UiThread;
@@ -230,9 +228,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
        mCallbacks.addListener(listener);

        mCallbacks.addListener(listener);





        if (ENABLE_SHELL_TRANSITIONS) {

        if (ENABLE_SHELL_TRANSITIONS) {

            RemoteTransition transition = newRemoteTransition(mCallbacks,

            final ActivityOptions options = ActivityOptions.makeBasic();

                    mCtx.getIApplicationThread());

            final ActivityOptions options = ActivityOptions.makeRemoteTransition(transition);

            // Allowing to pause Home if Home is top activity and Recents is not Home. So when user

            // Allowing to pause Home if Home is top activity and Recents is not Home. So when user

            // start home when recents animation is playing, the home activity can be resumed again

            // start home when recents animation is playing, the home activity can be resumed again

            // to let the transition controller collect Home activity.

            // to let the transition controller collect Home activity.
@@ -248,7 +244,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
                options.setTransientLaunch();

                options.setTransientLaunch();

            }

            }

            options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime);

            options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_RECENTS_ANIMATION, eventTime);

            UI_HELPER_EXECUTOR.execute(() -> mCtx.startActivity(intent, options.toBundle()));

            SystemUiProxy.INSTANCE.getNoCreate().startRecentsActivity(intent, options, mCallbacks);

        } else {

        } else {

            UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()

            UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance()

                    .startRecentsActivity(intent, eventTime, mCallbacks, null, null));

                    .startRecentsActivity(intent, eventTime, mCallbacks, null, null));