From 4b5aa78c898a827c3cd65f578d31d3809b61aad6 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 2 Oct 2012 18:11:25 -0700 Subject: [PATCH] Delay setting hidden until after isVisibleNow test. Setting hidden prior to test guarantees the test will fail. This then causes the exit animation to not be loaded and consequently the window is immediately hidden. Then, when the window is removed later it reappears in order to animate away. The consequent flash is undesirable. Bug: 7242373 fixed. Change-Id: I56966bd9060124be372702090f86b29b4deea8c0 --- services/java/com/android/server/wm/WindowManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index ae805c38c7e55..caf5c31fd414b 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3639,8 +3639,6 @@ public class WindowManagerService extends IWindowManager.Stub if (wtoken != null) { boolean delayed = false; if (!wtoken.hidden) { - wtoken.hidden = true; - final int N = wtoken.windows.size(); boolean changed = false; @@ -3661,6 +3659,8 @@ public class WindowManagerService extends IWindowManager.Stub } } + wtoken.hidden = true; + if (changed) { performLayoutAndPlaceSurfacesLocked(); updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,