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

Commit 3f0645ea authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Allow reentry bounds to be overriden before saving" into rvc-qpr-dev am: c4da5706 

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

Change-Id: I56a878222281889fb8d777886f97a544625fd678
parents 84e2c075 c4da5706

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+19 −11
Original line number Diff line number Diff line
@@ -355,17 +355,8 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
    @Override

    public void onPipTransitionStarted(ComponentName activity, int direction) {

        if (isOutPipDirection(direction)) {

            // On phones, the expansion animation that happens on pip tap before restoring

            // to fullscreen makes it so that the bounds received here are the expanded

            // bounds. We want to restore to the unexpanded bounds when re-entering pip,

            // so we save the bounds before expansion (normal) instead of the current

            // bounds.

            mReentryBounds.set(mTouchHandler.getNormalBounds());

            // Apply the snap fraction of the current bounds to the normal bounds.

            final Rect bounds = mPipTaskOrganizer.getLastReportedBounds();

            float snapFraction = mPipBoundsHandler.getSnapFraction(bounds);

            mPipBoundsHandler.applySnapFraction(mReentryBounds, snapFraction);

            // Save reentry bounds (normal non-expand bounds with current position applied).

            // Exiting PIP, save the reentry bounds to restore to when re-entering.

            updateReentryBounds();

            mPipBoundsHandler.onSaveReentryBounds(activity, mReentryBounds);

        }

        // Disable touches while the animation is running
@@ -379,6 +370,23 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio 
        }

    }



    /**

     * Update the bounds used to save the re-entry size and snap fraction when exiting PIP.

     */

    public void updateReentryBounds() {

        // On phones, the expansion animation that happens on pip tap before restoring

        // to fullscreen makes it so that the last reported bounds are the expanded

        // bounds. We want to restore to the unexpanded bounds when re-entering pip,

        // so we use the bounds before expansion (normal) instead of the reported

        // bounds.

        Rect reentryBounds = mTouchHandler.getNormalBounds();

        // Apply the snap fraction of the current bounds to the normal bounds.

        final Rect bounds = mPipTaskOrganizer.getLastReportedBounds();

        float snapFraction = mPipBoundsHandler.getSnapFraction(bounds);

        mPipBoundsHandler.applySnapFraction(reentryBounds, snapFraction);

        mReentryBounds.set(reentryBounds);

    }



    @Override

    public void onPipTransitionFinished(ComponentName activity, int direction) {

        onPipTransitionFinishedOrCanceled(direction);