Merge "Add symmetric Getters to PictureInPictureParams" into tm-dev am: aa61eeefa7 (1879a0f0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -6645,6 +6645,15 @@ package android.app {

		public final class PictureInPictureParams implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.List<android.app.RemoteAction> getActions();
		method @Nullable public android.util.Rational getAspectRatio();
		method @Nullable public android.app.RemoteAction getCloseAction();
		method @Nullable public android.util.Rational getExpandedAspectRatio();
		method @Nullable public android.graphics.Rect getSourceRectHint();
		method @Nullable public CharSequence getSubtitle();
		method @Nullable public CharSequence getTitle();
		method public boolean isAutoEnterEnabled();
		method public boolean isSeamlessResizeEnabled();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR;
		}

core/api/test-current.txt

+2 −8

Original line number	Diff line number	Diff line
		@@ -356,14 +356,8 @@ package android.app {
		}

		public final class PictureInPictureParams implements android.os.Parcelable {
		method public java.util.List<android.app.RemoteAction> getActions();
		method public float getAspectRatio();
		method @Nullable public android.app.RemoteAction getCloseAction();
		method public float getExpandedAspectRatio();
		method public android.graphics.Rect getSourceRectHint();
		method @Nullable public CharSequence getSubtitle();
		method @Nullable public CharSequence getTitle();
		method public boolean isSeamlessResizeEnabled();
		method public float getAspectRatioFloat();
		method public float getExpandedAspectRatioFloat();
		}

		public final class PictureInPictureUiState implements android.os.Parcelable {

core/java/android/app/PictureInPictureParams.java

+59 −26

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ public final class PictureInPictureParams implements Parcelable {
		private Rational mAspectRatio;

		/**
		* The expected aspect ratio of the vertically expanded picture-in-picture window.
		* The expected aspect ratio of the expanded picture-in-picture window.
		*/
		@Nullable
		private Rational mExpandedAspectRatio;
		@@ -441,15 +441,21 @@ public final class PictureInPictureParams implements Parcelable {
		* @hide
		*/
		@TestApi
		public float getAspectRatio() {
		public float getAspectRatioFloat() {
		if (mAspectRatio != null) {
		return mAspectRatio.floatValue();
		}
		return 0f;
		}

		/** @hide */
		public Rational getAspectRatioRational() {
		/**
		* Returns the expected aspect ratio of the picture-in-picture window.
		*
		* @return aspect ratio as the desired width / height or {@code null} if not set.
		* @see PictureInPictureParams.Builder#setAspectRatio(Rational)
		*/
		@Nullable
		public Rational getAspectRatio() {
		return mAspectRatio;
		}

		@@ -466,13 +472,24 @@ public final class PictureInPictureParams implements Parcelable {
		* @hide
		*/
		@TestApi
		public float getExpandedAspectRatio() {
		public float getExpandedAspectRatioFloat() {
		if (mExpandedAspectRatio != null) {
		return mExpandedAspectRatio.floatValue();
		}
		return 0f;
		}

		/**
		* Returns the desired aspect ratio of the expanded picture-in-picture window.
		*
		* @return aspect ratio as the desired width / height or {@code null} if not set.
		* @see PictureInPictureParams.Builder#setExpandedAspectRatio(Rational)
		*/
		@Nullable
		public Rational getExpandedAspectRatio() {
		return mExpandedAspectRatio;
		}

		/**
		* @return whether the expanded aspect ratio is set
		* @hide
		@@ -482,11 +499,17 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return the set of user actions.
		* @hide
		* Returns the list of user actions that are associated with the activity when in
		* picture-in-picture mode.
		*
		* @return the user actions in a new list.
		* @see PictureInPictureParams.Builder#setActions(List)
		*/
		@TestApi
		@NonNull
		public List<RemoteAction> getActions() {
		if (mUserActions == null) {
		return new ArrayList<>();
		}
		return mUserActions;
		}

		@@ -499,10 +522,11 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return the close action.
		* @hide
		* Returns the action that is to replace the system close action.
		*
		* @return the close action or {@code null} if not set.
		* @see PictureInPictureParams.Builder#setCloseAction(RemoteAction)
		*/
		@TestApi
		@Nullable
		public RemoteAction getCloseAction() {
		return mCloseAction;
		@@ -528,10 +552,12 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return the source rect hint
		* @hide
		* Returns the source rect hint.
		*
		* @return the source rect hint also known as launch bounds or {@code null} if not set.
		* @see PictureInPictureParams.Builder#setSourceRectHint(Rect)
		*/
		@TestApi
		@Nullable
		public Rect getSourceRectHint() {
		return mSourceRectHint;
		}
		@@ -545,18 +571,23 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return whether auto pip is enabled.
		* @hide
		* Returns whether auto enter picture-in-picture is enabled.
		*
		* @return {@code true} if the system will automatically put the activity in
		* picture-in-picture mode.
		* @see PictureInPictureParams.Builder#setAutoEnterEnabled(boolean)
		*/
		public boolean isAutoEnterEnabled() {
		return mAutoEnterEnabled == null ? false : mAutoEnterEnabled;
		}

		/**
		* @return whether seamless resize is enabled.
		* @hide
		* Returns whether seamless resize is enabled.
		*
		* @return true if the system can seamlessly resize the window while activity is in
		* picture-in-picture mode.
		* @see PictureInPictureParams.Builder#setSeamlessResizeEnabled(boolean)
		*/
		@TestApi
		public boolean isSeamlessResizeEnabled() {
		return mSeamlessResizeEnabled == null ? true : mSeamlessResizeEnabled;
		}
		@@ -570,10 +601,11 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return title of the pip.
		* @hide
		* Returns the title of the picture-in-picture window that may be displayed to the user.
		*
		* @return title of the picture-in-picture window.
		* @see PictureInPictureParams.Builder#setTitle(CharSequence)
		*/
		@TestApi
		@Nullable
		public CharSequence getTitle() {
		return mTitle;
		@@ -588,10 +620,11 @@ public final class PictureInPictureParams implements Parcelable {
		}

		/**
		* @return subtitle of the pip.
		* @hide
		* Returns the subtitle of the picture-in-picture window that may be displayed to the user.
		*
		* @return subtitle of the picture-in-picture window.
		* @see PictureInPictureParams.Builder#setSubtitle(CharSequence)
		*/
		@TestApi
		@Nullable
		public CharSequence getSubtitle() {
		return mSubtitle;
		@@ -716,7 +749,7 @@ public final class PictureInPictureParams implements Parcelable {
		@Override
		public String toString() {
		return "PictureInPictureParams("
		+ " aspectRatio=" + getAspectRatioRational()
		+ " aspectRatio=" + getAspectRatio()
		+ " expandedAspectRatio=" + mExpandedAspectRatio
		+ " sourceRectHint=" + getSourceRectHint()
		+ " hasSetActions=" + hasSetActions()

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public class PipBoundsAlgorithm {
		public float getAspectRatioOrDefault(
		@android.annotation.Nullable PictureInPictureParams params) {
		return params != null && params.hasSetAspectRatio()
		? params.getAspectRatio()
		? params.getAspectRatioFloat()
		: getDefaultAspectRatio();
		}

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1071,13 +1071,13 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		*/
		private boolean applyPictureInPictureParams(@NonNull PictureInPictureParams params) {
		final Rational currentAspectRatio =
		mPictureInPictureParams != null ? mPictureInPictureParams.getAspectRatioRational()
		mPictureInPictureParams != null ? mPictureInPictureParams.getAspectRatio()
		: null;
		final boolean aspectRatioChanged = !Objects.equals(currentAspectRatio,
		params.getAspectRatioRational());
		params.getAspectRatio());
		mPictureInPictureParams = params;
		if (aspectRatioChanged) {
		mPipBoundsState.setAspectRatio(params.getAspectRatio());
		mPipBoundsState.setAspectRatio(params.getAspectRatioFloat());
		}
		return aspectRatioChanged;
		}