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

Invalidate resized bounds on aspect ratio changes

Browse Source 
When the aspect ratio is changed on the pinned window,
the previously saved user-resize bounds are used as
the restore bounds when unexpanding, which have the previous
aspect ratio still.
This change invalidates the user resized bounds on aspect
ratio changes, which then forces it to be re-set to the new
normal bounds.

Bug: 163420655
Test: PIP portrait Youtube video, touch to expand menu, click
'next' icon to switch to a landscape video. The landscape video
should restore to its unexpanded bounds with the correct aspect
ratio.

Change-Id: I808993a921e3dc3858fad2c131e6a86bf45955e0
This commit is contained in:
jorgegil@google.com
2020-08-14 17:33:28 -07:00
parent ae5e71786e
commit 9b9c7d019b
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,10 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio
@Override @Override
public void onAspectRatioChanged(float aspectRatio) { public void onAspectRatioChanged(float aspectRatio) {
mHandler.post(() -> mPipBoundsHandler.onAspectRatioChanged(aspectRatio)); mHandler.post(() -> {
mPipBoundsHandler.onAspectRatioChanged(aspectRatio);
mTouchHandler.onAspectRatioChanged();
});
} }
} }

4
packages/SystemUI/src/com/android/systemui/pip/phone/PipResizeGestureHandler.java
View File

@@ -364,6 +364,10 @@ public class PipResizeGestureHandler {
mUserResizeBounds.set(bounds); mUserResizeBounds.set(bounds);
} }
void invalidateUserResizeBounds() {
mUserResizeBounds.setEmpty();
}
Rect getUserResizeBounds() { Rect getUserResizeBounds() {
return mUserResizeBounds; return mUserResizeBounds;
} }

13
packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
View File

@@ -426,8 +426,21 @@ public class PipTouchHandler {
} }
} }
/**
* Responds to IPinnedStackListener on resetting aspect ratio for the pinned window.
*/
public void onAspectRatioChanged() {
mPipResizeGestureHandler.invalidateUserResizeBounds();
}
public void onMovementBoundsChanged(Rect insetBounds, Rect normalBounds, Rect curBounds, public void onMovementBoundsChanged(Rect insetBounds, Rect normalBounds, Rect curBounds,
boolean fromImeAdjustment, boolean fromShelfAdjustment, int displayRotation) { boolean fromImeAdjustment, boolean fromShelfAdjustment, int displayRotation) {
// Set the user resized bounds equal to the new normal bounds in case they were
// invalidated (e.g. by an aspect ratio change).
if (mPipResizeGestureHandler.getUserResizeBounds().isEmpty()) {
mPipResizeGestureHandler.setUserResizeBounds(normalBounds);
}
final int bottomOffset = mIsImeShowing ? mImeHeight : 0; final int bottomOffset = mIsImeShowing ? mImeHeight : 0;
final boolean fromDisplayRotationChanged = (mDisplayRotation != displayRotation); final boolean fromDisplayRotationChanged = (mDisplayRotation != displayRotation);
if (fromDisplayRotationChanged) { if (fromDisplayRotationChanged) {