Merge "Continue deferring removal of activities in a transition" into tm-qpr-dev
This commit is contained in:
@@ -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_STARTING_REVEAL;
|
||||
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.TRANSITION;
|
||||
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);
|
||||
}
|
||||
|
||||
boolean isExitAnimationRunningSelfOrChild() {
|
||||
return isAnimating(CHILDREN, ANIMATION_TYPE_WINDOW_ANIMATION);
|
||||
}
|
||||
|
||||
private boolean shouldFinishAnimatingExit() {
|
||||
// Exit animation might be applied soon.
|
||||
if (inTransition()) {
|
||||
|
||||
Reference in New Issue
Block a user