Merge "Reduce PiP flickering when switch apps with orientation change" into udc-dev am: 4b4b8d7b08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23370657 Change-Id: I0164a1546694692bd10f5399c43eb2a7e06c6b34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -249,11 +249,6 @@ public class PipTransition extends PipTransitionController {
|
|||||||
finishTransaction);
|
finishTransaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fade in the fadeout PIP when the fixed rotation is finished.
|
|
||||||
if (mPipTransitionState.isInPip() && !mInFixedRotation && mHasFadeOut) {
|
|
||||||
fadeExistingPip(true /* show */);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1056,6 +1051,12 @@ public class PipTransition extends PipTransitionController {
|
|||||||
.crop(finishTransaction, leash, destBounds)
|
.crop(finishTransaction, leash, destBounds)
|
||||||
.round(finishTransaction, leash, isInPip)
|
.round(finishTransaction, leash, isInPip)
|
||||||
.shadow(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. */
|
/** Hides and shows the existing PIP during fixed rotation transition of other activities. */
|
||||||
|
|||||||
Reference in New Issue
Block a user