Merge "Don't move stashed PiP in response to keep clear areas changes." into tm-qpr-dev am: 8ae6380120
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20141170 Change-Id: I847c9e9f651f6beebd6487688e023ff58ef5ec3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -161,6 +161,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb
|
|||||||
// early bail out if the keep clear areas feature is disabled
|
// early bail out if the keep clear areas feature is disabled
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (mPipBoundsState.isStashed()) {
|
||||||
|
// don't move when stashed
|
||||||
|
return;
|
||||||
|
}
|
||||||
// if there is another animation ongoing, wait for it to finish and try again
|
// if there is another animation ongoing, wait for it to finish and try again
|
||||||
if (mPipAnimationController.isAnimating()) {
|
if (mPipAnimationController.isAnimating()) {
|
||||||
mMainExecutor.removeCallbacks(
|
mMainExecutor.removeCallbacks(
|
||||||
|
|||||||
Reference in New Issue
Block a user