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

Commit b003364b authored by Jaewan Kim's avatar Jaewan Kim
Browse files

Revert "Prevent recents from closing while moving PiP to fullscreen." 

This reverts commit 744e6e3a
to prevent Recents from shown again after an activity is PIPed
immediately after the fullscreen.

Bug: 28333917
Change-Id: Ifeceb910eefc3eef109bdc3ed24e11109f2cf9b4
parent d212cfa1

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

+3 −5
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ 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);

    }
@@ -635,11 +638,6 @@ 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

+2 −6
Original line number Diff line number Diff line
@@ -149,15 +149,11 @@ 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