From c516a5c58ff505d7c53d79a174aa118f65cac366 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Wed, 12 Sep 2012 16:13:59 -0700 Subject: [PATCH] Only consider hiddenRequested when deciding layout This change removes the test for hidden when deciding whether to do a layout. So layout begins as soon as hiddenRequested occurs. Since hidden is cleared when animations starts considering hidden in the layout decision will delay layout until it is too late. In particular we were not executing a relayout on return to an activity even though the screen had been rotated while away. Fixes bug 6615859. Change-Id: I5fb0b4bf2c253b910a7a192da04419236d8f09d9 --- services/java/com/android/server/wm/WindowState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 478475da5cd70..a06ee3ba991bd 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -806,7 +806,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { return mViewVisibility == View.GONE || !mRelayoutCalled || (atoken == null && mRootToken.hidden) - || (atoken != null && (atoken.hiddenRequested || atoken.hidden)) + || (atoken != null && atoken.hiddenRequested) || mAttachedHidden || mExiting || mDestroying; }