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

Snap the PIP window to the left or right edge after pinch resize

Browse Source 
Restrict the PIP resize to the left and right edges only,
instead of allowing the top or bottom edges as snap targets.

Bug: 186610221
Test: pinch to resize and let go at the center top or bottom
edge - verify it snaps to either side of the screen

Change-Id: Ifbc96fddc000ccb2ae344755a9276f24e67d4571
This commit is contained in:
jorgegil@google.com
2021-05-17 17:44:23 -07:00
parent 63e732e89e
commit ef11620ccf
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,15 @@ public class PipBoundsAlgorithm {
* the default stack bounds when first entering PiP.
*/
public float getSnapFraction(Rect stackBounds) {
return mSnapAlgorithm.getSnapFraction(stackBounds, getMovementBounds(stackBounds));
return getSnapFraction(stackBounds, getMovementBounds(stackBounds));
}
/**
* @return the default snap fraction to apply instead of the default gravity when calculating
* the default stack bounds when first entering PiP.
*/
public float getSnapFraction(Rect stackBounds, Rect movementBounds) {
return mSnapAlgorithm.getSnapFraction(stackBounds, movementBounds);
}
/**

13
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java
View File

@@ -514,7 +514,18 @@ public class PipResizeGestureHandler {
|| mLastResizeBounds.height() >= PINCH_RESIZE_AUTO_MAX_RATIO * mMaxSize.y) {
resizeRectAboutCenter(mLastResizeBounds, mMaxSize.x, mMaxSize.y);
}
final float snapFraction = mPipBoundsAlgorithm.getSnapFraction(mLastResizeBounds);
final int leftEdge = mLastResizeBounds.left;
final Rect movementBounds =
mPipBoundsAlgorithm.getMovementBounds(mLastResizeBounds);
final int fromLeft = Math.abs(leftEdge - movementBounds.left);
final int fromRight = Math.abs(movementBounds.right - leftEdge);
// The PIP will be snapped to either the right or left edge, so calculate which one
// is closest to the current position.
final int newLeft = fromLeft < fromRight
? movementBounds.left : movementBounds.right;
mLastResizeBounds.offsetTo(newLeft, mLastResizeBounds.top);
final float snapFraction = mPipBoundsAlgorithm.getSnapFraction(
mLastResizeBounds, movementBounds);
mPipBoundsAlgorithm.applySnapFraction(mLastResizeBounds, snapFraction);
mPipTaskOrganizer.scheduleAnimateResizePip(startBounds, mLastResizeBounds,
PINCH_RESIZE_SNAP_DURATION, mAngle, callback);