Merge "Remove Launcher multi-window functionality that is no longer released" into main (6f73deb1) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -53,13 +53,10 @@ oneway interface IRecentsAnimationRunner {
		* Called when the system is ready for the handler to start animating all the visible tasks.
		*
		* @param homeContentInsets The current home app content insets
		* @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be
		* {@code null} if the device is not currently in split screen
		*/
		void onAnimationStart(in IRecentsAnimationController controller,
		in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers,
		in Rect homeContentInsets, in Rect minimizedHomeBounds, in Bundle extras,
		in @nullable TransitionInfo info) = 2;
		in Rect homeContentInsets, in Bundle extras, in @nullable TransitionInfo info) = 2;

		/**
		* Called when the task of an activity that has been started while the recents animation

+2 −4

Original line number	Diff line number	Diff line
		@@ -644,9 +644,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		mInstanceId, apps.size(), displayId);
		mListener.onAnimationStart(this,
		apps.toArray(new RemoteAnimationTarget[apps.size()]),
		new RemoteAnimationTarget[0],
		new Rect(0, 0, 0, 0), new Rect(), new Bundle(),
		null);
		new RemoteAnimationTarget[0], new Rect(), new Bundle(), null);
		for (int i = 0; i < mStateListeners.size(); i++) {
		mStateListeners.get(i).onTransitionStateChanged(TRANSITION_STATE_ANIMATING);
		}
		@@ -897,7 +895,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler,
		mListener.onAnimationStart(this,
		apps.toArray(new RemoteAnimationTarget[apps.size()]),
		wallpapers.toArray(new RemoteAnimationTarget[wallpapers.size()]),
		new Rect(0, 0, 0, 0), new Rect(), b, info);
		new Rect(), b, info);
		for (int i = 0; i < mStateListeners.size(); i++) {
		mStateListeners.get(i).onTransitionStateChanged(TRANSITION_STATE_ANIMATING);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ public class RecentsTransitionHandlerTest extends ShellTestCase {
		final IResultReceiver finishCallback = mock(IResultReceiver.class);

		final IBinder transition = startRecentsTransition(/* synthetic= */ true, runner);
		verify(runner).onAnimationStart(any(), any(), any(), any(), any(), any(), any());
		verify(runner).onAnimationStart(any(), any(), any(), any(), any(), any());

		// Finish and verify no transition remains and that the provided finish callback is called
		mRecentsTransitionHandler.findController(transition).finish(true /* toHome */,
		@@ -235,7 +235,7 @@ public class RecentsTransitionHandlerTest extends ShellTestCase {
		final IRecentsAnimationRunner runner = mock(IRecentsAnimationRunner.class);

		final IBinder transition = startRecentsTransition(/* synthetic= */ true, runner);
		verify(runner).onAnimationStart(any(), any(), any(), any(), any(), any(), any());
		verify(runner).onAnimationStart(any(), any(), any(), any(), any(), any());

		mRecentsTransitionHandler.findController(transition).cancel("test");
		mMainExecutor.flushAll();

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ public interface RecentsAnimationListener {
		*/
		void onAnimationStart(RecentsAnimationControllerCompat controller,
		RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,
		Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras, TransitionInfo info);
		Rect homeContentInsets, Bundle extras, TransitionInfo info);

		/**
		* Called when the animation into Recents was canceled. This call is made on the binder thread.