Merge "Removed sys-ui's use of static stack ids." (0e186ac3) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@

		package android.app;

		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

		@@ -1535,6 +1535,12 @@ public class ActivityManager {
		*/
		public int resizeMode;

		/**
		* The current configuration this task is in.
		* @hide
		*/
		final public Configuration configuration = new Configuration();

		public RecentTaskInfo() {
		}

		@@ -1580,6 +1586,7 @@ public class ActivityManager {
		}
		dest.writeInt(supportsSplitScreenMultiWindow ? 1 : 0);
		dest.writeInt(resizeMode);
		configuration.writeToParcel(dest, flags);
		}

		public void readFromParcel(Parcel source) {
		@@ -1604,6 +1611,7 @@ public class ActivityManager {
		Rect.CREATOR.createFromParcel(source) : null;
		supportsSplitScreenMultiWindow = source.readInt() == 1;
		resizeMode = source.readInt();
		configuration.readFromParcel(source);
		}

		public static final Creator<RecentTaskInfo> CREATOR
		@@ -1802,7 +1810,7 @@ public class ActivityManager {
		* The full configuration the task is currently running in.
		* @hide
		*/
		public Configuration configuration = new Configuration();
		final public Configuration configuration = new Configuration();

		public RunningTaskInfo() {
		}
		@@ -2577,7 +2585,7 @@ public class ActivityManager {
		* The full configuration the stack is currently running in.
		* @hide
		*/
		public Configuration configuration = new Configuration();
		final public Configuration configuration = new Configuration();

		@Override
		public int describeContents() {

core/java/android/app/IActivityManager.aidl

+12 −0

Original line number	Diff line number	Diff line
		@@ -499,6 +499,18 @@ interface IActivityManager {
		in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations);
		boolean moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate,
		in Rect initialBounds);
		/**
		* Dismisses split-screen multi-window mode.
		* {@param toTop} If true the current primary split-screen stack will be placed or left on top.
		*/
		void dismissSplitScreenMode(boolean toTop);
		/**
		* Dismisses PiP
		* @param animate True if the dismissal should be animated.
		* @param animationDuration The duration of the resize animation in milliseconds or -1 if the
		* default animation duration should be used.
		*/
		void dismissPip(boolean animate, int animationDuration);
		void suppressResizeConfigChanges(boolean suppress);
		void moveTasksToFullscreenStack(int fromStackId, boolean onTop);
		boolean moveTopActivityToPinnedStack(int stackId, in Rect bounds);

core/java/android/app/ITaskStackListener.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ oneway interface ITaskStackListener {
		void onTaskStackChanged();

		/** Called whenever an Activity is moved to the pinned stack from another stack. */
		void onActivityPinned(String packageName, int userId, int taskId);
		void onActivityPinned(String packageName, int userId, int taskId, int stackId);

		/** Called whenever an Activity is moved from the pinned stack to another stack. */
		void onActivityUnpinned();

core/java/android/app/TaskStackListener.java

+1 −1

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

		@Override
		public void onActivityPinned(String packageName, int userId, int taskId)
		public void onActivityPinned(String packageName, int userId, int taskId, int stackId)
		throws RemoteException {
		}

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.pip.phone;

		import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
		import static android.view.Display.DEFAULT_DISPLAY;
		@@ -73,7 +72,7 @@ public class PipManager implements BasePipManager {
		*/
		TaskStackListener mTaskStackListener = new TaskStackListener() {
		@Override
		public void onActivityPinned(String packageName, int userId, int taskId) {
		public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {
		mTouchHandler.onActivityPinned();
		mMediaController.onActivityPinned();
		mMenuController.onActivityPinned();