Merge "Reduce PiP flickering when switch apps with orientation change" into udc-dev am: 4b4b8d7b08 am: eb3d22a1cf am: ad88b689bd

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

Change-Id: I232ebfb44995fe0771777944ea5d93387f0b3008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-23 07:17:42 +00:00
committed by Automerger Merge Worker

View File

@@ -249,11 +249,6 @@ public class PipTransition extends PipTransitionController {
finishTransaction);
}
// Fade in the fadeout PIP when the fixed rotation is finished.
if (mPipTransitionState.isInPip() && !mInFixedRotation && mHasFadeOut) {
fadeExistingPip(true /* show */);
}
return false;
}
@@ -1056,6 +1051,12 @@ public class PipTransition extends PipTransitionController {
.crop(finishTransaction, leash, destBounds)
.round(finishTransaction, leash, isInPip)
.shadow(finishTransaction, leash, isInPip);
// Make sure the PiP keeps invisible if it was faded out. If it needs to fade in, that will
// be handled by onFixedRotationFinished().
if (isInPip && mHasFadeOut) {
startTransaction.setAlpha(leash, 0f);
finishTransaction.setAlpha(leash, 0f);
}
}
/** Hides and shows the existing PIP during fixed rotation transition of other activities. */