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

Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-08-15 19:04:47 +00:00
committed by Android (Google) Code Review
parent 45d2ff9b6a 83caa366f4
commit 1fb9466c1d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1334,7 +1334,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
&& ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden) && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
|| mWinAnimator.mAnimation != null || mWinAnimator.mAnimation != null
|| ((atoken != null) && (atoken.mAppAnimator.animation != null) || ((atoken != null) && (atoken.mAppAnimator.animation != null)
&& !mWinAnimator.isDummyAnimation())); && !mWinAnimator.isDummyAnimation())
|| isAnimatingWithSavedSurface());
} }
/** /**