diff options
| author | Chet Haase <chet@google.com> | 2012-10-31 16:51:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 16:51:23 -0700 |
| commit | 4af84142e08dd082ac5a0f94adb8c6df83589e2e (patch) | |
| tree | cebae472a90bc13ef0e27be505a93da0dab8b579 /services/java/com | |
| parent | 427279fb4d55caf61c88d90b8f348dfc915fbe20 (diff) | |
| parent | fe28ff0d063818762dd585a67fcffd61cabd5a2f (diff) | |
| download | frameworks_base-4af84142e08dd082ac5a0f94adb8c6df83589e2e.zip frameworks_base-4af84142e08dd082ac5a0f94adb8c6df83589e2e.tar.gz frameworks_base-4af84142e08dd082ac5a0f94adb8c6df83589e2e.tar.bz2 | |
am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit 'fe28ff0d063818762dd585a67fcffd61cabd5a2f':
Fix for regression in WindowManager orientation changes
Diffstat (limited to 'services/java/com')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 3532c0c..7958f9a 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -2773,7 +2773,7 @@ public class WindowManagerService extends IWindowManager.Stub // TODO: Remove once b/7094175 is fixed || ((String)win.mAttrs.getTitle()).contains("Keyguard") ) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility - + " " + requestedWidth + "x" + requestedHeight + " " + win.mAttrs); + + " req=" + requestedWidth + "x" + requestedHeight + " " + win.mAttrs); win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0; @@ -3003,6 +3003,10 @@ public class WindowManagerService extends IWindowManager.Stub } mInputMonitor.updateInputWindowsLw(true /*force*/); + + if (DEBUG_LAYOUT) { + Slog.v(TAG, "Relayout complete " + win + ": outFrame=" + outFrame.toShortString()); + } } if (configChanged) { @@ -8379,7 +8383,8 @@ 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.isConfigChanged()) + || ((win.mAttrs.type == TYPE_KEYGUARD || win.mAttrs.type == TYPE_WALLPAPER) && + win.isConfigChanged()) || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) { if (!win.mLayoutAttached) { if (initial) { @@ -9301,6 +9306,8 @@ public class WindowManagerService extends IWindowManager.Stub Log.wtf(TAG, "Unhandled exception in Window Manager", e); } finally { Surface.closeTransaction(); + if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, + "<<< CLOSE TRANSACTION performLayoutAndPlaceSurfaces"); } final WindowList defaultWindows = defaultDisplay.getWindowList(); |