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

Merge "Continue deferring removal of activities in a transition" into tm-qpr-dev am: bab5ec4a7e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19394339

Change-Id: I88a9eae4e476ace7e495f3b6846f9d08c0b7f533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-07-27 16:24:33 +00:00
committed by Automerger Merge Worker
parent ae63d6107a bab5ec4a7e
commit 71ea608a0f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,6 @@ import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITIO
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_STARTING_REVEAL; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_STARTING_REVEAL;
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;
import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS; import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION; import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
import static com.android.server.wm.WindowContainerChildProto.WINDOW; import static com.android.server.wm.WindowContainerChildProto.WINDOW;
@@ -4971,10 +4970,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
|| isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION); || isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION);
} }
boolean isExitAnimationRunningSelfOrChild() {
return isAnimating(CHILDREN, ANIMATION_TYPE_WINDOW_ANIMATION);
}
private boolean shouldFinishAnimatingExit() { private boolean shouldFinishAnimatingExit() {
// Exit animation might be applied soon. // Exit animation might be applied soon.
if (inTransition()) { if (inTransition()) {