Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not trigger move animation during PiP transition" into rvc-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-08-21 00:34:22 +00:00
committed by Android (Google) Code Review
parent ff2866cfd6 252f5173b7
commit 96bcb1b255
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2052,10 +2052,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// animating... let's do something. // animating... let's do something.
final int left = mWindowFrames.mFrame.left; final int left = mWindowFrames.mFrame.left;
final int top = mWindowFrames.mFrame.top; final int top = mWindowFrames.mFrame.top;
// During the transition from pip to fullscreen, the activity windowing mode is set to
// fullscreen at the beginning while the task is kept in pinned mode. Skip the move
// animation in such case since the transition is handled in SysUI.
final boolean hasMovementAnimation = getTask() == null
? getWindowConfiguration().hasMovementAnimations()
: getTask().getWindowConfiguration().hasMovementAnimations();
if (mToken.okToAnimate() if (mToken.okToAnimate()
&& (mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0 && (mAttrs.privateFlags & PRIVATE_FLAG_NO_MOVE_ANIMATION) == 0
&& !isDragResizing() && !isDragResizing()
&& getWindowConfiguration().hasMovementAnimations() && hasMovementAnimation
&& !mWinAnimator.mLastHidden && !mWinAnimator.mLastHidden
&& !mSeamlesslyRotated) { && !mSeamlesslyRotated) {
startMoveAnimation(left, top); startMoveAnimation(left, top);