Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5ab73bec: am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev

Browse Source 
* commit '5ab73becf7a6a8140ddd244edd0b4f0206f072ff':
  Revert "Restore wallpaper positioning between apps."
This commit is contained in:
Craig Mautner
2013-10-13 18:31:12 -07:00
committed by Android Git Automerger
parent 7c4f3b8134 5ab73becf7
commit 59cd8d70dc
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

@@ -1855,10 +1855,10 @@ public class WindowManagerService extends IWindowManager.Stub
// Now stick it in. // Now stick it in.
if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) { if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) {
Slog.v(TAG, "Moving wallpaper " + wallpaper Slog.v(TAG, "Moving wallpaper " + wallpaper
+ " from " + oldIndex + " to " + foundI); + " from " + oldIndex + " to " + 0);
} }
windows.add(foundI, wallpaper); windows.add(0, wallpaper);
mWindowsChanged = true; mWindowsChanged = true;
changed |= ADJUST_WALLPAPER_LAYERS_CHANGED; 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; return 0;
} }