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

Merge "Fix a bad merge" into sc-v2-dev

Browse Source
This commit is contained in:
Evan Rosky
2021-09-14 19:10:01 +00:00
committed by Android (Google) Code Review
parent 2c71adce9d 3f3f21406d
commit dea5627532
1 changed files with 5 additions and 3 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

@@ -4934,10 +4934,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
* this has become invisible. * this has become invisible.
*/ */
private void postApplyAnimation(boolean visible) { private void postApplyAnimation(boolean visible) {
final boolean usingShellTransitions =
mAtmService.getTransitionController().getTransitionPlayer() != null;
final boolean delayed = isAnimating(PARENTS | CHILDREN, final boolean delayed = isAnimating(PARENTS | CHILDREN,
ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_WINDOW_ANIMATION ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_WINDOW_ANIMATION
| ANIMATION_TYPE_RECENTS); | ANIMATION_TYPE_RECENTS);
if (!delayed) { if (!delayed && !usingShellTransitions) {
// We aren't delayed anything, but exiting windows rely on the animation finished // We aren't delayed anything, but exiting windows rely on the animation finished
// callback being called in case the ActivityRecord was pretending to be delayed, // callback being called in case the ActivityRecord was pretending to be delayed,
// which we might have done because we were in closing/opening apps list. // which we might have done because we were in closing/opening apps list.
@@ -4956,8 +4958,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// updated. // updated.
// If we're becoming invisible, update the client visibility if we are not running an // If we're becoming invisible, update the client visibility if we are not running an
// animation. Otherwise, we'll update client visibility in onAnimationFinished. // animation. Otherwise, we'll update client visibility in onAnimationFinished.
if (visible || !isAnimating(PARENTS, if (visible || !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)
ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)) { || usingShellTransitions) {
setClientVisible(visible); setClientVisible(visible);
} }