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

Merge "Polish round corner for auto-enter-pip" into sc-dev am: 628002c70c

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

Change-Id: I3f09bf9f1373aff6e9b4725724c3ae3bb3b114c4
This commit is contained in:
Hongwei Wang
2021-06-09 02:07:40 +00:00
committed by Automerger Merge Worker
parent 45cd26d02a 628002c70c
commit 46a93993be
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -628,8 +628,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
final Rect destinationBounds = mPipBoundsState.getBounds(); final Rect destinationBounds = mPipBoundsState.getBounds();
final SurfaceControl swipeToHomeOverlay = mSwipePipToHomeOverlay; final SurfaceControl swipeToHomeOverlay = mSwipePipToHomeOverlay;
final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction(); final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();
mSurfaceTransactionHelper.resetScale(tx, mLeash, destinationBounds); mSurfaceTransactionHelper
mSurfaceTransactionHelper.crop(tx, mLeash, destinationBounds); .resetScale(tx, mLeash, destinationBounds)
.crop(tx, mLeash, destinationBounds)
.round(tx, mLeash, isInPip());
// The animation is finished in the Launcher and here we directly apply the final touch. // The animation is finished in the Launcher and here we directly apply the final touch.
applyEnterPipSyncTransaction(destinationBounds, () -> { applyEnterPipSyncTransaction(destinationBounds, () -> {
// Ensure menu's settled in its final bounds first. // Ensure menu's settled in its final bounds first.

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

@@ -46,12 +46,13 @@ public class PipSurfaceTransactionHelper {
mTmpSourceRectF.set(sourceBounds); mTmpSourceRectF.set(sourceBounds);
mTmpDestinationRectF.set(destinationBounds); mTmpDestinationRectF.set(destinationBounds);
mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL); mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL);
final float cornerRadius = getScaledCornerRadius(sourceBounds, destinationBounds);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9) tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setPosition(leash, mTmpDestinationRectF.left, mTmpDestinationRectF.top) .setPosition(leash, mTmpDestinationRectF.left, mTmpDestinationRectF.top)
.setCornerRadius(leash, mCornerRadius); .setCornerRadius(leash, cornerRadius);
return new PictureInPictureSurfaceTransaction( return new PictureInPictureSurfaceTransaction(
mTmpDestinationRectF.left, mTmpDestinationRectF.top, mTmpDestinationRectF.left, mTmpDestinationRectF.top,
mTmpFloat9, 0 /* rotation */, mCornerRadius, sourceBounds); mTmpFloat9, 0 /* rotation */, cornerRadius, sourceBounds);
} }
public PictureInPictureSurfaceTransaction scale( public PictureInPictureSurfaceTransaction scale(
@@ -62,11 +63,12 @@ public class PipSurfaceTransactionHelper {
mTmpDestinationRectF.set(destinationBounds); mTmpDestinationRectF.set(destinationBounds);
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);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9) tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setPosition(leash, positionX, positionY) .setPosition(leash, positionX, positionY)
.setCornerRadius(leash, mCornerRadius); .setCornerRadius(leash, cornerRadius);
return new PictureInPictureSurfaceTransaction( return new PictureInPictureSurfaceTransaction(
positionX, positionY, mTmpFloat9, degree, mCornerRadius, sourceBounds); positionX, positionY, mTmpFloat9, degree, cornerRadius, sourceBounds);
} }
public PictureInPictureSurfaceTransaction scaleAndCrop( public PictureInPictureSurfaceTransaction scaleAndCrop(
@@ -83,12 +85,15 @@ public class PipSurfaceTransactionHelper {
final float left = destinationBounds.left - insets.left * scale; final float left = destinationBounds.left - insets.left * scale;
final float top = destinationBounds.top - insets.top * scale; final float top = destinationBounds.top - insets.top * scale;
mTmpTransform.setScale(scale, scale); mTmpTransform.setScale(scale, scale);
final Rect cornerRadiusRect = new Rect(destinationBounds);
cornerRadiusRect.inset(insets);
final float cornerRadius = getScaledCornerRadius(sourceBounds, cornerRadiusRect);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9) tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setWindowCrop(leash, mTmpDestinationRect) .setWindowCrop(leash, mTmpDestinationRect)
.setPosition(leash, left, top) .setPosition(leash, left, top)
.setCornerRadius(leash, mCornerRadius); .setCornerRadius(leash, cornerRadius);
return new PictureInPictureSurfaceTransaction( return new PictureInPictureSurfaceTransaction(
left, top, mTmpFloat9, 0 /* rotation */, mCornerRadius, mTmpDestinationRect); left, top, mTmpFloat9, 0 /* rotation */, cornerRadius, mTmpDestinationRect);
} }
public PictureInPictureSurfaceTransaction scaleAndRotate( public PictureInPictureSurfaceTransaction scaleAndRotate(
@@ -105,12 +110,22 @@ public class PipSurfaceTransactionHelper {
: (float) destinationBounds.height() / sourceBounds.height(); : (float) destinationBounds.height() / sourceBounds.height();
mTmpTransform.setRotate(degree, 0, 0); mTmpTransform.setRotate(degree, 0, 0);
mTmpTransform.postScale(scale, scale); mTmpTransform.postScale(scale, scale);
final Rect cornerRadiusRect = new Rect(destinationBounds);
cornerRadiusRect.inset(insets);
final float cornerRadius = getScaledCornerRadius(sourceBounds, cornerRadiusRect);
tx.setMatrix(leash, mTmpTransform, mTmpFloat9) tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
.setWindowCrop(leash, mTmpDestinationRect) .setWindowCrop(leash, mTmpDestinationRect)
.setPosition(leash, positionX, positionY) .setPosition(leash, positionX, positionY)
.setCornerRadius(leash, mCornerRadius); .setCornerRadius(leash, cornerRadius);
return new PictureInPictureSurfaceTransaction( return new PictureInPictureSurfaceTransaction(
positionX, positionY, mTmpFloat9, degree, mCornerRadius, mTmpDestinationRect); positionX, positionY, mTmpFloat9, degree, cornerRadius, mTmpDestinationRect);
}
/** @return the round corner radius scaled by given from and to bounds */
private float getScaledCornerRadius(Rect fromBounds, Rect toBounds) {
final float scale = (float) (Math.hypot(fromBounds.width(), fromBounds.height())
/ Math.hypot(toBounds.width(), toBounds.height()));
return mCornerRadius * scale;
} }
/** @return {@link SurfaceControl.Transaction} instance with vsync-id */ /** @return {@link SurfaceControl.Transaction} instance with vsync-id */