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

Commit e1421df8 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Prevent recents from closing while moving PiP to fullscreen." into... 

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev am: abadeba9 am: 63278b4e
am: 66356dde

* commit '66356dde':
  Prevent recents from closing while moving PiP to fullscreen.

Change-Id: I2bf5ab3cc8bc13ea3350b3c0bae4b1018852ea46
parents 358c6268 66356dde

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

+5 −3
Original line number Diff line number Diff line
@@ -276,9 +276,6 @@ public class PipManager { 
    void movePipToFullscreen() {

        mState = STATE_NO_PIP;

        mPipTaskId = TASK_ID_NO_PIP;

        for (int i = mListeners.size() - 1; i >= 0; --i) {

            mListeners.get(i).onMoveToFullscreen();

        }

        resizePinnedStack(mState);

    }
@@ -638,6 +635,11 @@ public class PipManager { 
        public void onPinnedStackAnimationEnded() {

            if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");

            switch (mState) {

                case STATE_NO_PIP:

                    for (int i = mListeners.size() - 1; i >= 0; --i) {

                        mListeners.get(i).onMoveToFullscreen();

                    }

                    break;

                case STATE_PIP_OVERLAY:

                    if (!mPipRecentsOverlayManager.isRecentsShown()) {

                        showPipOverlay();

services/core/java/com/android/server/wm/BoundsAnimationController.java

+6 −2
Original line number Diff line number Diff line
@@ -149,11 +149,15 @@ public class BoundsAnimationController { 
        public void onAnimationEnd(Animator animation) {

            if (DEBUG) Slog.d(TAG, "onAnimationEnd: mTarget=" + mTarget

                    + " mMoveToFullScreen=" + mMoveToFullScreen + " mWillReplace=" + mWillReplace);



            finishAnimation();

            if (mMoveToFullScreen && !mWillReplace) {

                mTarget.moveToFullscreen();

            }



            // If we finish the animation before we move the target to fullscreen,

            // recents may close itself and we may try and resume the previous

            // fullscreen app leading to churn and flicker after we then move

            // our target to fullscreen.

            finishAnimation();

        }



        @Override