Merge "Clean-up old docked-stack implementation from WM" into rvc-dev am: 149bbf89bc am: ec6efc6b47 (45b8f2ad) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityTaskManager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -215,8 +215,7 @@ public class ActivityTaskManager {
		public boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,
		boolean animate, Rect initialBounds, boolean showRecents) throws SecurityException {
		try {
		return getService().setTaskWindowingModeSplitScreenPrimary(taskId, createMode, toTop,
		animate, initialBounds, showRecents);
		return getService().setTaskWindowingModeSplitScreenPrimary(taskId, toTop);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/IActivityManager.aidl

+0 −23

Original line number	Diff line number	Diff line
		@@ -528,29 +528,6 @@ interface IActivityManager {
		boolean unlockUser(int userid, in byte[] token, in byte[] secret,
		in IProgressListener listener);
		void killPackageDependents(in String packageName, int userId);
		/**
		* Resizes the docked stack, and all other stacks as the result of the dock stack bounds change.
		*
		* @param dockedBounds The bounds for the docked stack.
		* @param tempDockedTaskBounds The temporary bounds for the tasks in the docked 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.
		* @param tempDockedTaskInsetBounds The temporary bounds for the tasks to calculate the insets.
		* When resizing, we usually "freeze" the layout of a task. To
		* achieve that, we also need to "freeze" the insets, which
		* gets achieved by changing task bounds but not bounds used
		* to calculate the insets in this transient state
		* @param tempOtherTaskBounds The temporary bounds for the tasks in all other stacks, or
		* {@code null} if they should be the same as the stack bounds.
		* @param tempOtherTaskInsetBounds Like {@code tempDockedTaskInsetBounds}, but for the other
		* stacks.
		* @throws RemoteException
		*/
		@UnsupportedAppUsage
		void resizeDockedStack(in Rect dockedBounds, in Rect tempDockedTaskBounds,
		in Rect tempDockedTaskInsetBounds,
		in Rect tempOtherTaskBounds, in Rect tempOtherTaskInsetBounds);
		@UnsupportedAppUsage
		void removeStack(int stackId);
		void makePackageIdle(String packageName, int userId);

core/java/android/app/IActivityTaskManager.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -244,8 +244,7 @@ interface IActivityTaskManager {
		*/
		boolean setTaskWindowingMode(int taskId, int windowingMode, boolean toTop);
		void moveTaskToStack(int taskId, int stackId, boolean toTop);
		boolean setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop,
		boolean animate, in Rect initialBounds, boolean showRecents);
		boolean setTaskWindowingModeSplitScreenPrimary(int taskId, boolean toTop);
		/**
		* Removes stacks in the input windowing modes from the system if they are of activity type
		* ACTIVITY_TYPE_STANDARD or ACTIVITY_TYPE_UNDEFINED

core/java/android/view/IRecentsAnimationController.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -66,11 +66,6 @@ interface IRecentsAnimationController {
		@UnsupportedAppUsage
		void setAnimationTargetsBehindSystemBars(boolean behindSystemBars);

		/**
		* Informs the system that the primary split-screen stack should be minimized.
		*/
		void setSplitScreenMinimized(boolean minimized);

		/**
		* Hides the current input method if one is showing.
		*/

core/java/android/view/IWindowManager.aidl

+1 −18

Original line number	Diff line number	Diff line
		@@ -444,8 +444,7 @@ interface IWindowManager
		WindowContentFrameStats getWindowContentFrameStats(IBinder token);

		/**
		* @return the dock side the current docked stack is at; must be one of the
		* WindowManagerGlobal.DOCKED_* values
		* This is a no-op.
		*/
		@UnsupportedAppUsage
		int getDockedStackSide();
		@@ -456,27 +455,11 @@ interface IWindowManager
		*/
		void setDockedStackDividerTouchRegion(in Rect touchableRegion);

		/**
		* Registers a listener that will be called when the dock divider changes its visibility or when
		* the docked stack gets added/removed.
		*/
		@UnsupportedAppUsage
		void registerDockedStackListener(IDockedStackListener listener);

		/**
		* Registers a listener that will be called when the pinned stack state changes.
		*/
		void registerPinnedStackListener(int displayId, IPinnedStackListener listener);

		/**
		* Updates the dim layer used while resizing.
		*
		* @param visible Whether the dim layer should be visible.
		* @param targetWindowingMode The windowing mode of the stack the dim layer should be placed on.
		* @param alpha The translucency of the dim layer, between 0 and 1.
		*/
		void setResizeDimLayer(boolean visible, int targetWindowingMode, float alpha);

		/**
		* Requests Keyboard Shortcuts from the displayed window.
		*