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

Merge "PiP: Better rotation angle calculation." into sc-dev

Browse Source
This commit is contained in:
Ben Lin
2021-02-08 20:20:39 +00:00
committed by Android (Google) Code Review
parent 123247e2d8 852a04c2da
commit 5f5968a225
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,7 @@ public class PipResizeGestureHandler {
private boolean mThresholdCrossed0;
private boolean mThresholdCrossed1;
private boolean mUsingPinchToZoom = false;
private float mAngle = 0;
int mFirstIndex = -1;
int mSecondIndex = -1;
@@ -420,18 +421,25 @@ public class PipResizeGestureHandler {
float down1X = mDownSecondaryPoint.x;
float down1Y = mDownSecondaryPoint.y;
// Top right + Bottom left pinch to zoom.
if ((down0X > focusX && down0Y < focusY && down1X < focusX && down1Y > focusY)
|| (down1X > focusX && down1Y < focusY
&& down0X < focusX && down0Y > focusY)) {
if (down0X > focusX && down0Y < focusY && down1X < focusX && down1Y > focusY) {
// Top right + Bottom left pinch to zoom.
mAngle = calculateRotationAngle(mLastResizeBounds.centerX(),
mLastResizeBounds.centerY(), x0, y0, x1, y1, true);
} else if ((down0X < focusX && down0Y < focusY
&& down1X > focusX && down1Y > focusY)
|| (down1X < focusX && down1Y < focusY
&& down0X > focusX && down0Y > focusY)) {
} else if (down1X > focusX && down1Y < focusY
&& down0X < focusX && down0Y > focusY) {
// Top right + Bottom left pinch to zoom.
mAngle = calculateRotationAngle(mLastResizeBounds.centerX(),
mLastResizeBounds.centerY(), x1, y1, x0, y0, true);
} else if (down0X < focusX && down0Y < focusY
&& down1X > focusX && down1Y > focusY) {
// Top left + bottom right pinch to zoom.
mAngle = calculateRotationAngle(mLastResizeBounds.centerX(),
mLastResizeBounds.centerY(), x0, y0, x1, y1, false);
} else if (down1X < focusX && down1Y < focusY
&& down0X > focusX && down0Y > focusY) {
// Top left + bottom right pinch to zoom.
mAngle = calculateRotationAngle(mLastResizeBounds.centerX(),
mLastResizeBounds.centerY(), x1, y1, x0, y0, false);
}
mLastResizeBounds.set(PipPinchResizingAlgorithm.pinchResize(x0, y0, x1, y1,
@@ -445,21 +453,26 @@ public class PipResizeGestureHandler {
}
}
private float mAngle = 0;
private float calculateRotationAngle(int focusX, int focusY, float x0, float y0,
float x1, float y1, boolean positive) {
private float calculateRotationAngle(int pivotX, int pivotY, float topX, float topY,
float bottomX, float bottomY, boolean positive) {
// The base angle is the angle formed by taking the angle between the center horizontal
// and one of the corners.
double baseAngle = Math.toDegrees(Math.atan2(Math.abs(mLastResizeBounds.top - focusY),
Math.abs(mLastResizeBounds.right - focusX)));
double baseAngle = Math.toDegrees(Math.atan2(Math.abs(mLastResizeBounds.top - pivotY),
Math.abs(mLastResizeBounds.right - pivotX)));
double angle0 = mThresholdCrossed0
? Math.toDegrees(Math.atan2(Math.abs(y0 - focusY), Math.abs(x0 - focusX)))
: baseAngle;
double angle1 = mThresholdCrossed1
? Math.toDegrees(Math.atan2(Math.abs(y1 - focusY), Math.abs(x1 - focusX)))
: baseAngle;
? Math.toDegrees(Math.atan2(pivotY - topY, topX - pivotX)) : baseAngle;
double angle1 = mThresholdCrossed0
? Math.toDegrees(Math.atan2(pivotY - bottomY, bottomX - pivotX)) : baseAngle;
if (positive) {
angle1 = angle1 < 0 ? 180 + angle1 : angle1 - 180;
} else {
angle0 = angle0 < 0 ? -angle0 - 180 : 180 - angle0;
angle1 = -angle1;
}
// Calculate the percentage difference of [0, 90] compare to the base angle.
double diff0 = (Math.max(0, Math.min(angle0, 90)) - baseAngle) / 90;