diff options
| author | 2022-08-03 21:03:42 +0000 | |
|---|---|---|
| committer | 2022-08-03 21:03:42 +0000 | |
| commit | 85b360b98137eaa2d5504f6c7ef39574d522abc3 (patch) | |
| tree | 81ebd5f4bc36a44b9f627fe595478471953bc00a | |
| parent | f89e4c174a40c697d66c9665ee83ff001607fd93 (diff) | |
| parent | cd0bb94e9867e671423906eb7436f751b3162bfc (diff) | |
Merge "Don't resize PiP on aspect ratio change if nothing changed." into tm-qpr-dev am: f5b0a3e3f7 am: cd0bb94e98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19484732
Change-Id: Ifed3db690a60ec5b0a5f93ed1c90d6cd49e73138
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 |