diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/BoundsAnimationController.java | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index 5febb9b52a31..d7efca7cac50 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -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(); diff --git a/services/core/java/com/android/server/wm/BoundsAnimationController.java b/services/core/java/com/android/server/wm/BoundsAnimationController.java index debb38257817..1f44b2971e24 100644 --- a/services/core/java/com/android/server/wm/BoundsAnimationController.java +++ b/services/core/java/com/android/server/wm/BoundsAnimationController.java @@ -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 |