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

Commit dc1a990c authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Resize PiP on display density dpi change" into tm-qpr-dev am: 18600531 

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



Change-Id: I700c4d5243f9e78839fe256c6902a1ab52c28fbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 529149c4 18600531

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

+27 −7
Original line number Diff line number Diff line
@@ -524,24 +524,44 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            mMenuController.attachPipMenuView();

            // Calculate the snap fraction of the current stack along the old movement bounds

            final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm();

            final Rect postChangeStackBounds = new Rect(mPipBoundsState.getBounds());

            final float snapFraction = pipSnapAlgorithm.getSnapFraction(postChangeStackBounds,

                    mPipBoundsAlgorithm.getMovementBounds(postChangeStackBounds),

            final Rect postChangeBounds = new Rect(mPipBoundsState.getBounds());

            final float snapFraction = pipSnapAlgorithm.getSnapFraction(postChangeBounds,

                    mPipBoundsAlgorithm.getMovementBounds(postChangeBounds),

                    mPipBoundsState.getStashedState());



            // Scale PiP on density dpi change, so it appears to be the same size physically.

            final boolean densityDpiChanged = mPipBoundsState.getDisplayLayout().densityDpi() != 0

                    && (mPipBoundsState.getDisplayLayout().densityDpi() != layout.densityDpi());

            if (densityDpiChanged) {

                final float scale = (float) layout.densityDpi()

                        / mPipBoundsState.getDisplayLayout().densityDpi();

                postChangeBounds.set(0, 0,

                        (int) (postChangeBounds.width() * scale),

                        (int) (postChangeBounds.height() * scale));

            }



            updateDisplayLayout.run();



            // Calculate the stack bounds in the new orientation based on same fraction along the

            // Calculate the PiP bounds in the new orientation based on same fraction along the

            // rotated movement bounds.

            final Rect postChangeMovementBounds = mPipBoundsAlgorithm.getMovementBounds(

                    postChangeStackBounds, false /* adjustForIme */);

            pipSnapAlgorithm.applySnapFraction(postChangeStackBounds, postChangeMovementBounds,

                    postChangeBounds, false /* adjustForIme */);

            pipSnapAlgorithm.applySnapFraction(postChangeBounds, postChangeMovementBounds,

                    snapFraction, mPipBoundsState.getStashedState(),

                    mPipBoundsState.getStashOffset(),

                    mPipBoundsState.getDisplayBounds(),

                    mPipBoundsState.getDisplayLayout().stableInsets());



            mTouchHandler.getMotionHelper().movePip(postChangeStackBounds);

            if (densityDpiChanged) {

                // Using PipMotionHelper#movePip directly here may cause race condition since

                // the app content in PiP mode may or may not be updated for the new density dpi.

                final int duration = mContext.getResources().getInteger(

                        R.integer.config_pipEnterAnimationDuration);

                mPipTaskOrganizer.scheduleAnimateResizePip(

                        postChangeBounds, duration, null /* updateBoundsCallback */);

            } else {

                mTouchHandler.getMotionHelper().movePip(postChangeBounds);

            }

        } else {

            updateDisplayLayout.run();

        }