Merge "Revert "Move recentsAnimationController to shell"" into udc-dev am:... (8c719f28) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ import com.android.wm.shell.pip.PipUiEventLogger;
		import com.android.wm.shell.pip.phone.PipTouchHandler;
		import com.android.wm.shell.recents.RecentTasks;
		import com.android.wm.shell.recents.RecentTasksController;
		import com.android.wm.shell.recents.RecentsTransitionHandler;
		import com.android.wm.shell.splitscreen.SplitScreen;
		import com.android.wm.shell.splitscreen.SplitScreenController;
		import com.android.wm.shell.startingsurface.StartingSurface;
		@@ -521,9 +520,6 @@ public abstract class WMShellBaseModule {
		desktopModeTaskRepository, mainExecutor));
		}

		@BindsOptionalOf
		abstract RecentsTransitionHandler optionalRecentsTransitionHandler();

		//
		// Shell transitions
		//
		@@ -807,7 +803,6 @@ public abstract class WMShellBaseModule {
		Optional<UnfoldTransitionHandler> unfoldTransitionHandler,
		Optional<FreeformComponents> freeformComponents,
		Optional<RecentTasksController> recentTasksOptional,
		Optional<RecentsTransitionHandler> recentsTransitionHandlerOptional,
		Optional<OneHandedController> oneHandedControllerOptional,
		Optional<HideDisplayCutoutController> hideDisplayCutoutControllerOptional,
		Optional<ActivityEmbeddingController> activityEmbeddingOptional,

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −13

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ import com.android.wm.shell.pip.phone.PipMotionHelper;
		import com.android.wm.shell.pip.phone.PipSizeSpecHandler;
		import com.android.wm.shell.pip.phone.PipTouchHandler;
		import com.android.wm.shell.recents.RecentTasksController;
		import com.android.wm.shell.recents.RecentsTransitionHandler;
		import com.android.wm.shell.splitscreen.SplitScreenController;
		import com.android.wm.shell.sysui.ShellCommandHandler;
		import com.android.wm.shell.sysui.ShellController;
		@@ -529,20 +528,9 @@ public abstract class WMShellModule {
		ShellInit shellInit,
		Optional<SplitScreenController> splitScreenOptional,
		Optional<PipTouchHandler> pipTouchHandlerOptional,
		Optional<RecentsTransitionHandler> recentsTransitionHandler,
		Transitions transitions) {
		return new DefaultMixedHandler(shellInit, transitions, splitScreenOptional,
		pipTouchHandlerOptional, recentsTransitionHandler);
		}

		@WMSingleton
		@Provides
		static RecentsTransitionHandler provideRecentsTransitionHandler(
		ShellInit shellInit,
		Transitions transitions,
		Optional<RecentTasksController> recentTasksController) {
		return new RecentsTransitionHandler(shellInit, transitions,
		recentTasksController.orElse(null));
		pipTouchHandlerOptional);
		}

		//

libs/WindowManager/Shell/src/com/android/wm/shell/recents/IRecentTasks.aidl

+0 −11

Original line number	Diff line number	Diff line
		@@ -17,11 +17,6 @@
		package com.android.wm.shell.recents;

		import android.app.ActivityManager.RunningTaskInfo;
		import android.app.IApplicationThread;
		import android.app.PendingIntent;
		import android.content.Intent;
		import android.os.Bundle;
		import android.view.IRecentsAnimationRunner;

		import com.android.wm.shell.recents.IRecentTasksListener;
		import com.android.wm.shell.util.GroupedRecentTaskInfo;
		@@ -50,10 +45,4 @@ interface IRecentTasks {
		* Gets the set of running tasks.
		*/
		RunningTaskInfo[] getRunningTasks(int maxNum) = 4;

		/**
		* Starts a recents transition.
		*/
		oneway void startRecentsTransition(in PendingIntent intent, in Intent fillIn, in Bundle options,
		IApplicationThread appThread, IRecentsAnimationRunner listener) = 5;
		}

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+1 −24

Original line number	Diff line number	Diff line
		@@ -24,18 +24,13 @@ import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RE

		import android.app.ActivityManager;
		import android.app.ActivityTaskManager;
		import android.app.IApplicationThread;
		import android.app.PendingIntent;
		import android.app.TaskInfo;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		import android.view.IRecentsAnimationRunner;

		import androidx.annotation.BinderThread;
		import androidx.annotation.NonNull;
		@@ -84,7 +79,6 @@ public class RecentTasksController implements TaskStackListenerCallback,
		private final TaskStackListenerImpl mTaskStackListener;
		private final RecentTasksImpl mImpl = new RecentTasksImpl();
		private final ActivityTaskManager mActivityTaskManager;
		private RecentsTransitionHandler mTransitionHandler = null;
		private IRecentTasksListener mListener;
		private final boolean mIsDesktopMode;

		@@ -156,10 +150,6 @@ public class RecentTasksController implements TaskStackListenerCallback,
		mDesktopModeTaskRepository.ifPresent(it -> it.addActiveTaskListener(this));
		}

		void setTransitionHandler(RecentsTransitionHandler handler) {
		mTransitionHandler = handler;
		}

		/**
		* Adds a split pair. This call does not validate the taskIds, only that they are not the same.
		*/
		@@ -502,18 +492,5 @@ public class RecentTasksController implements TaskStackListenerCallback,
		true /* blocking */);
		return tasks[0];
		}

		@Override
		public void startRecentsTransition(PendingIntent intent, Intent fillIn, Bundle options,
		IApplicationThread appThread, IRecentsAnimationRunner listener) {
		if (mController.mTransitionHandler == null) {
		Slog.e(TAG, "Used shell-transitions startRecentsTransition without"
		+ " shell-transitions");
		return;
		}
		executeRemoteCallWithTaskPermission(mController, "startRecentsTransition",
		(controller) -> controller.mTransitionHandler.startRecentsTransition(
		intent, fillIn, options, appThread, listener));
		}
		}
		}
		No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

deleted100644 → 0

+0 −759

File deleted.

Preview size limit exceeded, changes collapsed.