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

Commit 9e5bed7e 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: 8c25c1d5

Change-Id: I16e2b71d62977f1c28c51135c46fd4e2b2aef91b
parents a6a1036f 8c25c1d5

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