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>
This commit is contained in:
@@ -495,14 +495,15 @@ public class PipController implements PipTransitionController.PipTransitionCallb
|
|||||||
mPipBoundsState.getBounds(),
|
mPipBoundsState.getBounds(),
|
||||||
mPipBoundsState.getAspectRatio());
|
mPipBoundsState.getAspectRatio());
|
||||||
Objects.requireNonNull(destinationBounds, "Missing destination bounds");
|
Objects.requireNonNull(destinationBounds, "Missing destination bounds");
|
||||||
mPipTaskOrganizer.scheduleAnimateResizePip(destinationBounds,
|
if (!destinationBounds.equals(mPipBoundsState.getBounds())) {
|
||||||
mEnterAnimationDuration,
|
mPipTaskOrganizer.scheduleAnimateResizePip(destinationBounds,
|
||||||
null /* updateBoundsCallback */);
|
mEnterAnimationDuration,
|
||||||
|
null /* updateBoundsCallback */);
|
||||||
mTouchHandler.onAspectRatioChanged();
|
mTouchHandler.onAspectRatioChanged();
|
||||||
updateMovementBounds(null /* toBounds */, false /* fromRotation */,
|
updateMovementBounds(null /* toBounds */, false /* fromRotation */,
|
||||||
false /* fromImeAdjustment */, false /* fromShelfAdjustment */,
|
false /* fromImeAdjustment */, false /* fromShelfAdjustment */,
|
||||||
null /* windowContainerTransaction */);
|
null /* windowContainerTransaction */);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user