From 39b80e5c417ff915ca9097683e848597ccee7849 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 29 Jun 2016 16:13:22 -0700 Subject: [PATCH] Apply animation in relayout invisible the old way We skipped the applyAnimationLocked to work around a problem with cached animation loading, however app could be animating without window animator (only app animator) in which case we shouldn't do the relayout for potential focus change. Revert to the old behavior and let applyAnimationLocked decide if we want to relayout for focus change. bug: 29874980 Change-Id: I6fdfbe41cbafd7017477c0eda9b4fd26e66c517f --- .../core/java/com/android/server/wm/WindowManagerService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 84173d26ef8b7..4083ba699de0d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3003,8 +3003,7 @@ public class WindowManagerService extends IWindowManager.Stub if (win.mAttrs.type == TYPE_APPLICATION_STARTING) { transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE; } - if (win.isWinVisibleLw() && (winAnimator.isAnimationSet() || - winAnimator.applyAnimationLocked(transit, false))) { + if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) { focusMayChange = isDefaultDisplay; win.mAnimatingExit = true; win.mWinAnimator.mAnimating = true;