diff options
| author | 2022-08-03 20:37:33 +0000 | |
|---|---|---|
| committer | 2022-08-03 20:37:33 +0000 | |
| commit | cd0bb94e9867e671423906eb7436f751b3162bfc (patch) | |
| tree | cd30c6bcad298a6eff827e243e855eb96b22e900 | |
| parent | 72badcab6f93dd8a0b04faaf4d3e9c2078e6d69f (diff) | |
| parent | f5b0a3e3f727e48d53b42a1e278215c579c7fd32 (diff) | |
Merge "Don't resize PiP on aspect ratio change if nothing changed." into tm-qpr-dev am: f5b0a3e3f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19484732
Change-Id: I5284923aeab808fb0459d23c6e60e119688c1973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java index 420d6067f420..586e3a014506 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java @@ -495,14 +495,15 @@ public class PipController implements PipTransitionController.PipTransitionCallb mPipBoundsState.getBounds(), mPipBoundsState.getAspectRatio()); Objects.requireNonNull(destinationBounds, "Missing destination bounds"); - mPipTaskOrganizer.scheduleAnimateResizePip(destinationBounds, - mEnterAnimationDuration, - null /* updateBoundsCallback */); - - mTouchHandler.onAspectRatioChanged(); - updateMovementBounds(null /* toBounds */, false /* fromRotation */, - false /* fromImeAdjustment */, false /* fromShelfAdjustment */, - null /* windowContainerTransaction */); + if (!destinationBounds.equals(mPipBoundsState.getBounds())) { + mPipTaskOrganizer.scheduleAnimateResizePip(destinationBounds, + mEnterAnimationDuration, + null /* updateBoundsCallback */); + mTouchHandler.onAspectRatioChanged(); + updateMovementBounds(null /* toBounds */, false /* fromRotation */, + false /* fromImeAdjustment */, false /* fromShelfAdjustment */, + null /* windowContainerTransaction */); + } } @Override |