Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687ed (48e6a12f) · Commits · e / os / android_frameworks_base

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,6 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void removeStacksWithActivityTypes(int[]) throws java.lang.SecurityException;
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void requestPictureInPictureMode(@NonNull android.os.IBinder);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeDockedStack(android.graphics.Rect, android.graphics.Rect);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizePinnedStack(int, android.graphics.Rect, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void resizeTask(int, android.graphics.Rect);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setDisplayToSingleTaskInstance(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean setTaskWindowingMode(int, int, boolean) throws java.lang.SecurityException;

core/java/android/app/ActivityTaskManager.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -361,25 +361,6 @@ public class ActivityTaskManager {
		}
		}

		/**
		* Resize the input stack id to the given bounds with animate setting.
		* @param stackId Id of the stack to resize.
		* @param bounds Bounds to resize the stack to or {@code null} for fullscreen.
		* @param animate Whether we should play an animation for resizing stack.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
		public void resizePinnedStack(int stackId, Rect bounds, boolean animate) {
		try {
		if (animate) {
		getService().animateResizePinnedStack(stackId, bounds, -1 /* animationDuration */);
		} else {
		getService().resizePinnedStack(bounds, null /* tempPinnedTaskBounds */);
		}
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Resize task to given bounds.
		* @param taskId Id of task to resize.

core/java/android/app/IActivityTaskManager.aidl

+0 −37

Original line number	Diff line number	Diff line
		@@ -236,32 +236,8 @@ interface IActivityTaskManager {
		*/
		boolean setTaskWindowingMode(int taskId, int windowingMode, boolean toTop);
		void moveTaskToStack(int taskId, int stackId, boolean toTop);
		/**
		* Resizes the input pinned stack to the given bounds with animation.
		*
		* @param stackId Id of the pinned stack to resize.
		* @param bounds Bounds to resize the stack to or {@code null} for fullscreen.
		* @param animationDuration The duration of the resize animation in milliseconds or -1 if the
		* default animation duration should be used.
		* @throws RemoteException
		*/
		void animateResizePinnedStack(int stackId, in Rect bounds, int animationDuration);
		boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,
		boolean animate, in Rect initialBounds, boolean showRecents);
		/**
		* Use the offset to adjust the stack boundary with animation.
		*
		* @param stackId Id of the stack to adjust.
		* @param compareBounds Offset is only applied if the current pinned stack bounds is equal to
		* the compareBounds.
		* @param xOffset The horizontal offset.
		* @param yOffset The vertical offset.
		* @param animationDuration The duration of the resize animation in milliseconds or -1 if the
		* default animation duration should be used.
		* @throws RemoteException
		*/
		void offsetPinnedStackBounds(int stackId, in Rect compareBounds, int xOffset, int yOffset,
		int animationDuration);
		/**
		* Removes stacks in the input windowing modes from the system if they are of activity type
		* ACTIVITY_TYPE_STANDARD or ACTIVITY_TYPE_UNDEFINED
		@@ -371,23 +347,10 @@ interface IActivityTaskManager {
		void startLocalVoiceInteraction(in IBinder token, in Bundle options);
		void stopLocalVoiceInteraction(in IBinder token);
		boolean supportsLocalVoiceInteraction();
		void notifyPinnedStackAnimationStarted();
		void notifyPinnedStackAnimationEnded();

		// Get device configuration
		ConfigurationInfo getDeviceConfigurationInfo();

		/**
		* Resizes the pinned stack.
		*
		* @param pinnedBounds The bounds for the pinned stack.
		* @param tempPinnedTaskBounds The temporary bounds for the tasks in the pinned stack, which
		* might be different from the stack bounds to allow more
		* flexibility while resizing, or {@code null} if they should be the
		* same as the stack bounds.
		*/
		void resizePinnedStack(in Rect pinnedBounds, in Rect tempPinnedTaskBounds);

		void dismissKeyguard(in IBinder token, in IKeyguardDismissCallback callback,
		in CharSequence message);

core/java/android/app/ITaskStackListener.aidl

+0 −10

Original line number	Diff line number	Diff line
		@@ -45,16 +45,6 @@ oneway interface ITaskStackListener {
		*/
		void onPinnedActivityRestartAttempt(boolean clearedTask);

		/**
		* Called whenever the pinned stack is starting animating a resize.
		*/
		void onPinnedStackAnimationStarted();

		/**
		* Called whenever the pinned stack is done animating a resize.
		*/
		void onPinnedStackAnimationEnded();

		/**
		* Called when we launched an activity that we forced to be resizable.
		*

core/java/android/app/TaskStackListener.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -56,16 +56,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {
		public void onPinnedActivityRestartAttempt(boolean clearedTask) throws RemoteException {
		}

		@Override
		@UnsupportedAppUsage
		public void onPinnedStackAnimationStarted() throws RemoteException {
		}

		@Override
		@UnsupportedAppUsage
		public void onPinnedStackAnimationEnded() throws RemoteException {
		}

		@Override
		@UnsupportedAppUsage
		public void onActivityForcedResizable(String packageName, int taskId, int reason)