diff options
| author | 2012-11-06 16:22:49 -0800 | |
|---|---|---|
| committer | 2012-11-06 16:22:50 -0800 | |
| commit | 184b2c1ed12f96656c8d2854e08683d76bdf367b (patch) | |
| tree | e958de651e172a786210e0a30ec569188fa1b347 | |
| parent | 474a93003018ebd4fe99249f51b1e35e23a27f5a (diff) | |
| parent | f02296f599bc03353a76a2ead73d8975704bfd46 (diff) | |
Merge "Layout windows that are about to animate."
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 06594090e326..35dd79243241 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -8365,7 +8365,7 @@ public class WindowManagerService extends IWindowManager.Stub // soon won't be visible, to avoid wasting time and funky // changes while a window is animating away. final boolean gone = (behindDream && mPolicy.canBeForceHidden(win, win.mAttrs)) - || win.isGoneForLayoutLw(); + || (win.isGoneForLayoutLw() && !win.isOnScreen()); if (DEBUG_LAYOUT && !win.mLayoutAttached) { Slog.v(TAG, "1ST PASS " + win @@ -8393,8 +8393,7 @@ public class WindowManagerService extends IWindowManager.Stub // windows, since that means "perform layout as normal, // just don't display"). if (!gone || !win.mHaveFrame || win.mLayoutNeeded - || ((win.mAttrs.type == TYPE_KEYGUARD || win.mAttrs.type == TYPE_WALLPAPER) && - win.isConfigChanged()) + || (win.mAttrs.type == TYPE_KEYGUARD && win.isConfigChanged()) || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) { if (!win.mLayoutAttached) { if (initial) { |