Merge "Notify task freeform constrains change to system UI (5/N)" (bd12f5a2) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+92 −15

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app;

		import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
		import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;

		import android.Manifest;
		import android.annotation.DrawableRes;
		@@ -31,6 +32,7 @@ import android.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.ConfigurationInfo;
		import android.content.pm.IPackageDataObserver;
		@@ -981,6 +983,9 @@ public class ActivityManager {
		private int mNavigationBarColor;
		private boolean mEnsureStatusBarContrastWhenTransparent;
		private boolean mEnsureNavigationBarContrastWhenTransparent;
		private int mResizeMode;
		private int mMinWidth;
		private int mMinHeight;

		/**
		* Creates the TaskDescription to the specified values.
		@@ -993,7 +998,8 @@ public class ActivityManager {
		*/
		@Deprecated
		public TaskDescription(String label, Bitmap icon, int colorPrimary) {
		this(label, icon, 0, null, colorPrimary, 0, 0, 0, false, false);
		this(label, icon, 0, null, colorPrimary, 0, 0, 0, false, false,
		RESIZE_MODE_RESIZEABLE, -1, -1);
		if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) {
		throw new RuntimeException("A TaskDescription's primary color should be opaque");
		}
		@@ -1009,7 +1015,8 @@ public class ActivityManager {
		* opaque.
		*/
		public TaskDescription(String label, @DrawableRes int iconRes, int colorPrimary) {
		this(label, null, iconRes, null, colorPrimary, 0, 0, 0, false, false);
		this(label, null, iconRes, null, colorPrimary, 0, 0, 0, false, false,
		RESIZE_MODE_RESIZEABLE, -1, -1);
		if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) {
		throw new RuntimeException("A TaskDescription's primary color should be opaque");
		}
		@@ -1024,7 +1031,7 @@ public class ActivityManager {
		*/
		@Deprecated
		public TaskDescription(String label, Bitmap icon) {
		this(label, icon, 0, null, 0, 0, 0, 0, false, false);
		this(label, icon, 0, null, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1);
		}

		/**
		@@ -1035,7 +1042,8 @@ public class ActivityManager {
		* activity.
		*/
		public TaskDescription(String label, @DrawableRes int iconRes) {
		this(label, null, iconRes, null, 0, 0, 0, 0, false, false);
		this(label, null, iconRes, null, 0, 0, 0, 0, false, false,
		RESIZE_MODE_RESIZEABLE, -1, -1);
		}

		/**
		@@ -1044,21 +1052,22 @@ public class ActivityManager {
		* @param label A label and description of the current state of this activity.
		*/
		public TaskDescription(String label) {
		this(label, null, 0, null, 0, 0, 0, 0, false, false);
		this(label, null, 0, null, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1);
		}

		/**
		* Creates an empty TaskDescription.
		*/
		public TaskDescription() {
		this(null, null, 0, null, 0, 0, 0, 0, false, false);
		this(null, null, 0, null, 0, 0, 0, 0, false, false, RESIZE_MODE_RESIZEABLE, -1, -1);
		}

		/** @hide */
		public TaskDescription(String label, Bitmap bitmap, int iconRes, String iconFilename,
		int colorPrimary, int colorBackground, int statusBarColor, int navigationBarColor,
		boolean ensureStatusBarContrastWhenTransparent,
		boolean ensureNavigationBarContrastWhenTransparent) {
		boolean ensureNavigationBarContrastWhenTransparent, int resizeMode, int minWidth,
		int minHeight) {
		mLabel = label;
		mIcon = bitmap;
		mIconRes = iconRes;
		@@ -1070,6 +1079,9 @@ public class ActivityManager {
		mEnsureStatusBarContrastWhenTransparent = ensureStatusBarContrastWhenTransparent;
		mEnsureNavigationBarContrastWhenTransparent =
		ensureNavigationBarContrastWhenTransparent;
		mResizeMode = resizeMode;
		mMinWidth = minWidth;
		mMinHeight = minHeight;
		}

		/**
		@@ -1095,6 +1107,9 @@ public class ActivityManager {
		mEnsureStatusBarContrastWhenTransparent = other.mEnsureStatusBarContrastWhenTransparent;
		mEnsureNavigationBarContrastWhenTransparent =
		other.mEnsureNavigationBarContrastWhenTransparent;
		mResizeMode = other.mResizeMode;
		mMinWidth = other.mMinWidth;
		mMinHeight = other.mMinHeight;
		}

		/**
		@@ -1120,6 +1135,9 @@ public class ActivityManager {
		mEnsureStatusBarContrastWhenTransparent = other.mEnsureStatusBarContrastWhenTransparent;
		mEnsureNavigationBarContrastWhenTransparent =
		other.mEnsureNavigationBarContrastWhenTransparent;
		mResizeMode = other.mResizeMode;
		mMinWidth = other.mMinWidth;
		mMinHeight = other.mMinHeight;
		}

		private TaskDescription(Parcel source) {
		@@ -1199,6 +1217,33 @@ public class ActivityManager {
		mIcon = null;
		}

		/**
		* Sets the resize mode for this task description. Resize mode as in
		* {@link android.content.pm.ActivityInfo}.
		* @hide
		*/
		public void setResizeMode(int resizeMode) {
		mResizeMode = resizeMode;
		}

		/**
		* The minimal width size to show the app content in freeform mode.
		* @param minWidth minimal width, -1 for system default.
		* @hide
		*/
		public void setMinWidth(int minWidth) {
		mMinWidth = minWidth;
		}

		/**
		* The minimal height size to show the app content in freeform mode.
		* @param minHeight minimal height, -1 for system default.
		* @hide
		*/
		public void setMinHeight(int minHeight) {
		mMinHeight = minHeight;
		}

		/**
		* @return The label and description of the current state of this task.
		*/
		@@ -1309,6 +1354,27 @@ public class ActivityManager {
		ensureNavigationBarContrastWhenTransparent;
		}

		/**
		* @hide
		*/
		public int getResizeMode() {
		return mResizeMode;
		}

		/**
		* @hide
		*/
		public int getMinWidth() {
		return mMinWidth;
		}

		/**
		* @hide
		*/
		public int getMinHeight() {
		return mMinHeight;
		}

		/** @hide */
		public void saveToXml(XmlSerializer out) throws IOException {
		if (mLabel != null) {
		@@ -1371,6 +1437,9 @@ public class ActivityManager {
		dest.writeInt(mNavigationBarColor);
		dest.writeBoolean(mEnsureStatusBarContrastWhenTransparent);
		dest.writeBoolean(mEnsureNavigationBarContrastWhenTransparent);
		dest.writeInt(mResizeMode);
		dest.writeInt(mMinWidth);
		dest.writeInt(mMinHeight);
		if (mIconFilename == null) {
		dest.writeInt(0);
		} else {
		@@ -1389,6 +1458,9 @@ public class ActivityManager {
		mNavigationBarColor = source.readInt();
		mEnsureStatusBarContrastWhenTransparent = source.readBoolean();
		mEnsureNavigationBarContrastWhenTransparent = source.readBoolean();
		mResizeMode = source.readInt();
		mMinWidth = source.readInt();
		mMinHeight = source.readInt();
		mIconFilename = source.readInt() > 0 ? source.readString() : null;
		}

		@@ -1404,14 +1476,16 @@ public class ActivityManager {

		@Override
		public String toString() {
		return "TaskDescription Label: " + mLabel + " Icon: " + mIcon +
		" IconRes: " + mIconRes + " IconFilename: " + mIconFilename +
		" colorPrimary: " + mColorPrimary + " colorBackground: " + mColorBackground +
		" statusBarColor: " + mStatusBarColor + (
		mEnsureStatusBarContrastWhenTransparent ? " (contrast when transparent)"
		: "") + " navigationBarColor: " + mNavigationBarColor + (
		mEnsureNavigationBarContrastWhenTransparent
		? " (contrast when transparent)" : "");
		return "TaskDescription Label: " + mLabel + " Icon: " + mIcon
		+ " IconRes: " + mIconRes + " IconFilename: " + mIconFilename
		+ " colorPrimary: " + mColorPrimary + " colorBackground: " + mColorBackground
		+ " statusBarColor: " + mStatusBarColor
		+ (mEnsureStatusBarContrastWhenTransparent ? " (contrast when transparent)"
		: "") + " navigationBarColor: " + mNavigationBarColor
		+ (mEnsureNavigationBarContrastWhenTransparent
		? " (contrast when transparent)" : "")
		+ " resizeMode: " + ActivityInfo.resizeModeToString(mResizeMode)
		+ " minWidth: " + mMinWidth + " minHeight: " + mMinHeight;
		}
		}

		@@ -1523,6 +1597,9 @@ public class ActivityManager {
		pw.print(" iconRes=" + (td.getIconResource() != 0));
		pw.print(" iconBitmap=" + (td.getIconFilename() != null
		\|\| td.getInMemoryIcon() != null));
		pw.print(" resizeMode=" + ActivityInfo.resizeModeToString(td.getResizeMode()));
		pw.print(" minWidth=" + td.getMinWidth());
		pw.print(" minHeight=" + td.getMinHeight());
		pw.println(" }");
		}
		}

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -2945,7 +2945,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		r.setTaskDescription(td);
		final TaskRecord task = r.getTaskRecord();
		task.updateTaskDescription();
		mTaskChangeNotificationController.notifyTaskDescriptionChanged(task.getTaskInfo());
		}
		}
		}

services/core/java/com/android/server/wm/TaskRecord.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -424,6 +424,7 @@ class TaskRecord extends Task {
		mResizeMode = resizeMode;
		mAtmService.mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
		mAtmService.mRootActivityContainer.resumeFocusedStacksTopActivities();
		updateTaskDescription();
		}

		boolean resize(Rect bounds, int resizeMode, boolean preserveWindow, boolean deferResume) {
		@@ -791,7 +792,10 @@ class TaskRecord extends Task {
		} else {
		autoRemoveRecents = false;
		}
		if (mResizeMode != info.resizeMode) {
		mResizeMode = info.resizeMode;
		updateTaskDescription();
		}
		mSupportsPictureInPicture = info.supportsPictureInPicture();
		}

		@@ -1550,12 +1554,15 @@ class TaskRecord extends Task {
		}
		final TaskDescription taskDescription = new TaskDescription(label, null, iconResource,
		iconFilename, colorPrimary, colorBackground, statusBarColor, navigationBarColor,
		statusBarContrastWhenTransparent, navigationBarContrastWhenTransparent);
		statusBarContrastWhenTransparent, navigationBarContrastWhenTransparent,
		mResizeMode, mMinWidth, mMinHeight);
		setTaskDescription(taskDescription);
		// Update the task affiliation color if we are the parent of the group
		if (mTaskId == mAffiliatedTaskId) {
		mAffiliatedTaskColor = taskDescription.getPrimaryColor();
		}
		mAtmService.getTaskChangeNotificationController().notifyTaskDescriptionChanged(
		getTaskInfo());
		}
		}