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

Merge "Ensure that the pip transaction matrix has only scale & rotation info" into sc-dev

Browse Source
This commit is contained in:
Winson Chung
2021-07-03 03:25:20 +00:00
committed by Android (Google) Code Review
parent 4ab79fdb68 a4b441144d
commit 7780fa9e7c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/shared/src/com/android/systemui/shared/pip/PipSurfaceTransactionHelper.java
View File

@@ -43,16 +43,18 @@ public class PipSurfaceTransactionHelper {
public PictureInPictureSurfaceTransaction scale( public PictureInPictureSurfaceTransaction scale(
SurfaceControl.Transaction tx, SurfaceControl leash, SurfaceControl.Transaction tx, SurfaceControl leash,
Rect sourceBounds, Rect destinationBounds) { Rect sourceBounds, Rect destinationBounds) {
float positionX = destinationBounds.left;
float positionY = destinationBounds.top;
mTmpSourceRectF.set(sourceBounds); mTmpSourceRectF.set(sourceBounds);
mTmpDestinationRectF.set(destinationBounds); mTmpDestinationRectF.set(destinationBounds);
mTmpDestinationRectF.offsetTo(0, 0);
mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL); mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL);
final float cornerRadius = getScaledCornerRadius(sourceBounds, destinationBounds); final float cornerRadius = getScaledCornerRadius(sourceBounds, destinationBounds);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9) tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setPosition(leash, mTmpDestinationRectF.left, mTmpDestinationRectF.top) .setPosition(leash, positionX, positionY)
.setCornerRadius(leash, cornerRadius); .setCornerRadius(leash, cornerRadius);
return new PictureInPictureSurfaceTransaction( return new PictureInPictureSurfaceTransaction(
mTmpDestinationRectF.left, mTmpDestinationRectF.top, positionX, positionY, mTmpFloat9, 0 /* rotation */, cornerRadius, sourceBounds);
mTmpFloat9, 0 /* rotation */, cornerRadius, sourceBounds);
} }
public PictureInPictureSurfaceTransaction scale( public PictureInPictureSurfaceTransaction scale(
@@ -61,6 +63,7 @@ public class PipSurfaceTransactionHelper {
float degree, float positionX, float positionY) { float degree, float positionX, float positionY) {
mTmpSourceRectF.set(sourceBounds); mTmpSourceRectF.set(sourceBounds);
mTmpDestinationRectF.set(destinationBounds); mTmpDestinationRectF.set(destinationBounds);
mTmpDestinationRectF.offsetTo(0, 0);
mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL); mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL);
mTmpTransform.postRotate(degree, 0, 0); mTmpTransform.postRotate(degree, 0, 0);
final float cornerRadius = getScaledCornerRadius(sourceBounds, destinationBounds); final float cornerRadius = getScaledCornerRadius(sourceBounds, destinationBounds);