Merge "Rename Stack to Task related terms (7/n)" into sc-dev (09f52aa4) · Commits · e / os / android_frameworks_base

core/java/android/app/ITaskStackListener.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,9 +60,9 @@ oneway interface ITaskStackListener {
		void onActivityForcedResizable(String packageName, int taskId, int reason);

		/**
		* Called when we launched an activity that dismissed the docked stack.
		* Called when we launched an activity that dismissed the docked task.
		*/
		void onActivityDismissingDockedStack();
		void onActivityDismissingDockedTask();

		/**
		* Called when an activity was requested to be launched on a secondary display but was not

core/java/android/app/TaskStackListener.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {

		@Override
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void onActivityPinned(String packageName, int userId, int taskId, int stackId)
		public void onActivityPinned(String packageName, int userId, int taskId, int rootTaskId)
		throws RemoteException {
		}

		@@ -66,7 +66,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {

		@Override
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void onActivityDismissingDockedStack() throws RemoteException {
		public void onActivityDismissingDockedTask() throws RemoteException {
		}

		@Override

core/java/android/view/IPinnedStackListener.aidl→core/java/android/view/IPinnedTaskListener.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,11 +23,11 @@ import android.graphics.Rect;
		import android.view.DisplayInfo;

		/**
		* Listener for changes to the pinned stack made by the WindowManager.
		* Listener for changes to the pinned task made by the WindowManager.
		*
		* @hide
		*/
		oneway interface IPinnedStackListener {
		oneway interface IPinnedTaskListener {

		/**
		* Called when the window manager has detected a change that would cause the movement bounds

core/java/android/view/IWindowManager.aidl

+4 −5

Original line number	Diff line number	Diff line
		@@ -35,13 +35,12 @@ import android.os.ParcelFileDescriptor;
		import android.view.DisplayCutout;
		import android.view.IApplicationToken;
		import android.view.IAppTransitionAnimationSpecsFuture;
		import android.view.IDockedStackListener;
		import android.view.IDisplayWindowInsetsController;
		import android.view.IDisplayWindowListener;
		import android.view.IDisplayFoldListener;
		import android.view.IDisplayWindowRotationController;
		import android.view.IOnKeyguardExitResult;
		import android.view.IPinnedStackListener;
		import android.view.IPinnedTaskListener;
		import android.view.IScrollCaptureCallbacks;
		import android.view.RemoteAnimationAdapter;
		import android.view.IRotationWatcher;
		@@ -446,12 +445,12 @@ interface IWindowManager
		* Sets the region the user can touch the divider. This region will be excluded from the region
		* which is used to cause a focus switch when dispatching touch.
		*/
		void setDockedStackDividerTouchRegion(in Rect touchableRegion);
		void setDockedTaskDividerTouchRegion(in Rect touchableRegion);

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

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

core/proto/android/server/windowmanagerservice.proto

+7 −7

Original line number	Diff line number	Diff line
		@@ -174,10 +174,10 @@ message DisplayContentProto {
		// Use root_display_area instead
		optional WindowContainerProto window_container = 1 [deprecated=true];
		optional int32 id = 2;
		reserved 3; // stacks
		optional DockedStackDividerControllerProto docked_stack_divider_controller = 4 [deprecated=true];
		reserved 3; // RootTasks
		optional DockedTaskDividerControllerProto docked_task_divider_controller = 4 [deprecated=true];
		// Will be removed soon.
		optional PinnedStackControllerProto pinned_stack_controller = 5 [deprecated=true];
		optional PinnedTaskControllerProto pinned_task_controller = 5 [deprecated=true];
		/* non app windows */
		repeated WindowTokenProto above_app_windows = 6 [deprecated=true];
		repeated WindowTokenProto below_app_windows = 7 [deprecated=true];
		@@ -256,15 +256,15 @@ message DisplayRotationProto {
		optional int32 last_orientation = 5 [(.android.typedef) = "android.content.pm.ActivityInfo.ScreenOrientation"];
		}

		/* represents DockedStackDividerController */
		message DockedStackDividerControllerProto {
		/* represents DockedTaskDividerController */
		message DockedTaskDividerControllerProto {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		optional bool minimized_dock = 1 [deprecated=true];
		}

		/* represents PinnedStackController */
		message PinnedStackControllerProto {
		/* represents PinnedTaskController */
		message PinnedTaskControllerProto {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		optional .android.graphics.RectProto default_bounds = 1 [deprecated=true];