Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix gravity after re-enabling expanded PiP" into tm-dev am: 6cc02e8d74 am: 809566f868

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570468

Change-Id: I1c71d0da42cb2094dd9e7e1995401aca042097d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jacqueline Bronger
2022-04-12 09:49:12 +00:00
committed by Automerger Merge Worker
parent 756f97e087 809566f868
commit be8ba94822
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsState.java
View File

@@ -35,7 +35,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
/** /**
* TV specific values of the current state of the PIP bounds. * TV specific values of the current state of the PiP bounds.
*/ */
public class TvPipBoundsState extends PipBoundsState { public class TvPipBoundsState extends PipBoundsState {
@@ -86,7 +86,7 @@ public class TvPipBoundsState extends PipBoundsState {
mTvPipGravity = DEFAULT_TV_GRAVITY; mTvPipGravity = DEFAULT_TV_GRAVITY;
} }
/** Set the tv expanded bounds of PIP */ /** Set the tv expanded bounds of PiP */
public void setTvExpandedSize(@Nullable Size size) { public void setTvExpandedSize(@Nullable Size size) {
mTvExpandedSize = size; mTvExpandedSize = size;
} }
@@ -97,20 +97,24 @@ public class TvPipBoundsState extends PipBoundsState {
return mTvExpandedSize; return mTvExpandedSize;
} }
/** Set the PIP aspect ratio for the expanded PIP (TV) that is desired by the app. */ /** Set the PiP aspect ratio for the expanded PiP (TV) that is desired by the app. */
public void setDesiredTvExpandedAspectRatio(float aspectRatio, boolean override) { public void setDesiredTvExpandedAspectRatio(float aspectRatio, boolean override) {
if (override || mTvFixedPipOrientation == ORIENTATION_UNDETERMINED || aspectRatio == 0) { if (override || mTvFixedPipOrientation == ORIENTATION_UNDETERMINED) {
mDesiredTvExpandedAspectRatio = aspectRatio; mDesiredTvExpandedAspectRatio = aspectRatio;
resetTvPipState(); resetTvPipState();
return; return;
} }
if ((aspectRatio > 1 && mTvFixedPipOrientation == ORIENTATION_HORIZONTAL) if ((aspectRatio > 1 && mTvFixedPipOrientation == ORIENTATION_HORIZONTAL)
|| (aspectRatio <= 1 && mTvFixedPipOrientation == ORIENTATION_VERTICAL)) { || (aspectRatio <= 1 && mTvFixedPipOrientation == ORIENTATION_VERTICAL)
|| aspectRatio == 0) {
mDesiredTvExpandedAspectRatio = aspectRatio; mDesiredTvExpandedAspectRatio = aspectRatio;
} }
} }
/** Get the PIP aspect ratio for the expanded PIP (TV) that is desired by the app. */ /**
* Get the aspect ratio for the expanded PiP (TV) that is desired, or {@code 0} if it is not
* enabled by the app.
*/
public float getDesiredTvExpandedAspectRatio() { public float getDesiredTvExpandedAspectRatio() {
return mDesiredTvExpandedAspectRatio; return mDesiredTvExpandedAspectRatio;
} }