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

Commit 96e5ece1 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Only notify the floating coordinator of new bounds if we're in PIP."... 

Merge "Only notify the floating coordinator of new bounds if we're in PIP." into rvc-dev am: a48a152c am: a80b3923 am: 58f8977c

Change-Id: I525b08a56d17b49974c37944fab1e8a2bddf8f5c
parents d2fd7fe9 58f8977c

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ public class PipTaskOrganizer extends TaskOrganizer { 
        return new Rect(mLastReportedBounds);

    }



    public boolean isInPip() {

        return mInPip;

    }



    /**

     * Registers {@link PipTransitionCallback} to receive transition callbacks.

     */

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

+4 −1
Original line number Diff line number Diff line
@@ -168,8 +168,11 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
    void synchronizePinnedStackBounds() {

        cancelAnimations();

        mBounds.set(mPipTaskOrganizer.getLastReportedBounds());



        if (mPipTaskOrganizer.isInPip()) {

            mFloatingContentCoordinator.onContentMoved(this);

        }

    }



    /**

     * Synchronizes the current bounds with either the pinned stack, or the ongoing animation. This