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

Merge "Make PiP round corners when entering from split screen." into tm-dev am: 0b6bf0f229

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

Change-Id: Idc289d28a57718c837fd3e16f1db2841a301e855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2022-04-08 19:56:25 +00:00
committed by Automerger Merge Worker
parent d81fd0227c 0b6bf0f229
commit 8a876b250b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -665,6 +665,15 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
mSurfaceControlTransactionFactory.getTransaction(); mSurfaceControlTransactionFactory.getTransaction();
tx.setAlpha(mLeash, 0f); tx.setAlpha(mLeash, 0f);
tx.apply(); tx.apply();
// When entering PiP this transaction will be applied within WindowContainerTransaction and
// ensure that the PiP has rounded corners.
final SurfaceControl.Transaction boundsChangeTx =
mSurfaceControlTransactionFactory.getTransaction();
mSurfaceTransactionHelper
.crop(boundsChangeTx, mLeash, destinationBounds)
.round(boundsChangeTx, mLeash, true /* applyCornerRadius */);
mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED); mPipTransitionState.setTransitionState(PipTransitionState.ENTRY_SCHEDULED);
applyEnterPipSyncTransaction(destinationBounds, () -> { applyEnterPipSyncTransaction(destinationBounds, () -> {
mPipAnimationController mPipAnimationController
@@ -677,7 +686,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
// mState is set right after the animation is kicked off to block any resize // mState is set right after the animation is kicked off to block any resize
// requests such as offsetPip that may have been called prior to the transition. // requests such as offsetPip that may have been called prior to the transition.
mPipTransitionState.setTransitionState(PipTransitionState.ENTERING_PIP); mPipTransitionState.setTransitionState(PipTransitionState.ENTERING_PIP);
}, null /* boundsChangeTransaction */); }, boundsChangeTx);
} }
private void onEndOfSwipePipToHomeTransition() { private void onEndOfSwipePipToHomeTransition() {