From 7c495cbf68d8315e585e4dfc6fb7daa7a5028b12 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Sun, 13 Oct 2013 23:19:45 +0000 Subject: [PATCH] Revert "Restore wallpaper positioning between apps." This reverts commit faf1a40382b61d9cabab82e6e835603511046564. Bug 10932680 is back where it was. Change-Id: I5058db837941769f25f09e3fafd9c19ef370df8e --- .../com/android/server/wm/WindowManagerService.java | 11 +++++++++-- 1 file 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 b2b01646dc7dd..8216769871312 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -1855,10 +1855,10 @@ public class WindowManagerService extends IWindowManager.Stub // Now stick it in. if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) { Slog.v(TAG, "Moving wallpaper " + wallpaper - + " from " + oldIndex + " to " + foundI); + + " from " + oldIndex + " to " + 0); } - windows.add(foundI, wallpaper); + windows.add(0, wallpaper); mWindowsChanged = true; changed |= ADJUST_WALLPAPER_LAYERS_CHANGED; } @@ -4671,6 +4671,13 @@ public class WindowManagerService extends IWindowManager.Stub } } } + // Never put an app window underneath wallpaper. + for (int pos = NW - 1; pos >= 0; pos--) { + if (windows.get(pos).mIsWallpaper) { + if (DEBUG_REORDER) Slog.v(TAG, "Found wallpaper @" + pos); + return pos + 1; + } + } return 0; }