drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev

Browse Source
This commit is contained in:
Chet Haase
2012-10-31 16:49:12 -07:00
committed by Android (Google) Code Review
parent c1c53e56fb d5d11af3d3
commit fe28ff0d06
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -2773,7 +2773,7 @@ public class WindowManagerService extends IWindowManager.Stub
// TODO: Remove once b/7094175 is fixed // TODO: Remove once b/7094175 is fixed
|| ((String)win.mAttrs.getTitle()).contains("Keyguard") || ((String)win.mAttrs.getTitle()).contains("Keyguard")
) Slog.v(TAG, "Relayout " + win + ": viewVisibility=" + viewVisibility ) 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; win.mEnforceSizeCompat = (win.mAttrs.flags & FLAG_COMPATIBLE_WINDOW) != 0;
@ -3003,6 +3003,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
mInputMonitor.updateInputWindowsLw(true /*force*/); mInputMonitor.updateInputWindowsLw(true /*force*/);
if (DEBUG_LAYOUT) {
Slog.v(TAG, "Relayout complete " + win + ": outFrame=" + outFrame.toShortString());
}
} }
if (configChanged) { if (configChanged) {
@ -8379,7 +8383,8 @@ public class WindowManagerService extends IWindowManager.Stub
// windows, since that means "perform layout as normal, // windows, since that means "perform layout as normal,
// just don't display"). // just don't display").
if (!gone || !win.mHaveFrame || win.mLayoutNeeded 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) { || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) {
if (!win.mLayoutAttached) { if (!win.mLayoutAttached) {
if (initial) { if (initial) {
@ -9301,6 +9306,8 @@ public class WindowManagerService extends IWindowManager.Stub
Log.wtf(TAG, "Unhandled exception in Window Manager", e); Log.wtf(TAG, "Unhandled exception in Window Manager", e);
} finally { } finally {
Surface.closeTransaction(); Surface.closeTransaction();
if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG,
"<<< CLOSE TRANSACTION performLayoutAndPlaceSurfaces");
} }
final WindowList defaultWindows = defaultDisplay.getWindowList(); final WindowList defaultWindows = defaultDisplay.getWindowList();