Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd0bb94e authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Don't resize PiP on aspect ratio change if nothing changed." into tm-qpr-dev am: f5b0a3e3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19484732



Change-Id: I5284923aeab808fb0459d23c6e60e119688c1973
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72badcab f5b0a3e3

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+9 −8
Original line number Diff line number Diff line
@@ -495,15 +495,16 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                                        mPipBoundsState.getBounds(),

                                        mPipBoundsState.getAspectRatio());

                        Objects.requireNonNull(destinationBounds, "Missing destination bounds");

                        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

                    public void onActionsChanged(List<RemoteAction> actions,