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

Merge "show WSA when ready when using shell transitions" into tm-qpr-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-05-19 21:22:14 +00:00
committed by Android (Google) Code Review
parent 4f72de8dca 4c15784756
commit 2da86beb92
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4454,8 +4454,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
* color mode set to avoid jank in the middle of the transition. * color mode set to avoid jank in the middle of the transition.
*/ */
boolean canShowWindows() { boolean canShowWindows() {
return allDrawn && !(isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION) final boolean drawn = mTransitionController.isShellTransitionsEnabled()
&& hasNonDefaultColorWindow()); ? mSyncState != SYNC_STATE_WAITING_FOR_DRAW : allDrawn;
final boolean animating = mTransitionController.isShellTransitionsEnabled()
? mTransitionController.inTransition(this)
: isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION);
return drawn && !(animating && hasNonDefaultColorWindow());
} }
/** /**