Merge "[2/n] Adds reachability education for double-tap" into tm-qpr-dev (4970f339) · Commits · e / os / android_frameworks_base

core/java/android/app/TaskInfo.java

+70 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,12 @@ import java.util.Objects;
		public class TaskInfo {
		private static final String TAG = "TaskInfo";

		/**
		* The value to use when the property has not a specific value.
		* @hide
		*/
		public static final int PROPERTY_VALUE_UNSET = -1;

		/**
		* The id of the user the task was running as if this is a leaf task. The id of the current
		* running user of the system otherwise.
		@@ -229,6 +235,40 @@ public class TaskInfo {
		*/
		public boolean topActivityEligibleForLetterboxEducation;

		/**
		* Whether the double tap is enabled
		* @hide
		*/
		public boolean isLetterboxDoubleTapEnabled;

		/**
		* If {@link isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position or
		* {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.
		* @hide
		*/
		public int topActivityLetterboxVerticalPosition;

		/**
		* If {@link isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position or
		* {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.
		* @hide
		*/
		public int topActivityLetterboxHorizontalPosition;

		/**
		* If {@link isLetterboxDoubleTapEnabled} it contains the current width of the letterboxed
		* activity or {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise
		* @hide
		*/
		public int topActivityLetterboxWidth;

		/**
		* If {@link isLetterboxDoubleTapEnabled} it contains the current height of the letterboxed
		* activity or {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise
		* @hide
		*/
		public int topActivityLetterboxHeight;

		/**
		* Whether this task is resizable. Unlike {@link #resizeMode} (which is what the top activity
		* supports), this is what the system actually uses for resizability based on other policy and
		@@ -407,7 +447,8 @@ public class TaskInfo {
		/** @hide */
		public boolean hasCompatUI() {
		return hasCameraCompatControl() \|\| topActivityInSizeCompat
		\|\| topActivityEligibleForLetterboxEducation;
		\|\| topActivityEligibleForLetterboxEducation
		\|\| isLetterboxDoubleTapEnabled;
		}

		/**
		@@ -447,6 +488,12 @@ public class TaskInfo {
		&& isResizeable == that.isResizeable
		&& supportsMultiWindow == that.supportsMultiWindow
		&& displayAreaFeatureId == that.displayAreaFeatureId
		&& isLetterboxDoubleTapEnabled == that.isLetterboxDoubleTapEnabled
		&& topActivityLetterboxVerticalPosition == that.topActivityLetterboxVerticalPosition
		&& topActivityLetterboxWidth == that.topActivityLetterboxWidth
		&& topActivityLetterboxHeight == that.topActivityLetterboxHeight
		&& topActivityLetterboxHorizontalPosition
		== that.topActivityLetterboxHorizontalPosition
		&& Objects.equals(positionInParent, that.positionInParent)
		&& Objects.equals(pictureInPictureParams, that.pictureInPictureParams)
		&& Objects.equals(shouldDockBigOverlays, that.shouldDockBigOverlays)
		@@ -475,6 +522,12 @@ public class TaskInfo {
		&& topActivityInSizeCompat == that.topActivityInSizeCompat
		&& topActivityEligibleForLetterboxEducation
		== that.topActivityEligibleForLetterboxEducation
		&& isLetterboxDoubleTapEnabled == that.isLetterboxDoubleTapEnabled
		&& topActivityLetterboxVerticalPosition == that.topActivityLetterboxVerticalPosition
		&& topActivityLetterboxHorizontalPosition
		== that.topActivityLetterboxHorizontalPosition
		&& topActivityLetterboxWidth == that.topActivityLetterboxWidth
		&& topActivityLetterboxHeight == that.topActivityLetterboxHeight
		&& cameraCompatControlState == that.cameraCompatControlState
		// Bounds are important if top activity has compat controls.
		&& (!hasCompatUI() \|\| configuration.windowConfiguration.getBounds()
		@@ -529,6 +582,11 @@ public class TaskInfo {
		mTopActivityLocusId = source.readTypedObject(LocusId.CREATOR);
		displayAreaFeatureId = source.readInt();
		cameraCompatControlState = source.readInt();
		isLetterboxDoubleTapEnabled = source.readBoolean();
		topActivityLetterboxVerticalPosition = source.readInt();
		topActivityLetterboxHorizontalPosition = source.readInt();
		topActivityLetterboxWidth = source.readInt();
		topActivityLetterboxHeight = source.readInt();
		}

		/**
		@@ -576,6 +634,11 @@ public class TaskInfo {
		dest.writeTypedObject(mTopActivityLocusId, flags);
		dest.writeInt(displayAreaFeatureId);
		dest.writeInt(cameraCompatControlState);
		dest.writeBoolean(isLetterboxDoubleTapEnabled);
		dest.writeInt(topActivityLetterboxVerticalPosition);
		dest.writeInt(topActivityLetterboxHorizontalPosition);
		dest.writeInt(topActivityLetterboxWidth);
		dest.writeInt(topActivityLetterboxHeight);
		}

		@Override
		@@ -611,6 +674,12 @@ public class TaskInfo {
		+ " topActivityInSizeCompat=" + topActivityInSizeCompat
		+ " topActivityEligibleForLetterboxEducation= "
		+ topActivityEligibleForLetterboxEducation
		+ " topActivityLetterboxed= " + isLetterboxDoubleTapEnabled
		+ " topActivityLetterboxVerticalPosition= " + topActivityLetterboxVerticalPosition
		+ " topActivityLetterboxHorizontalPosition= "
		+ topActivityLetterboxHorizontalPosition
		+ " topActivityLetterboxWidth=" + topActivityLetterboxWidth
		+ " topActivityLetterboxHeight=" + topActivityLetterboxHeight
		+ " locusId=" + mTopActivityLocusId
		+ " displayAreaFeatureId=" + displayAreaFeatureId
		+ " cameraCompatControlState="