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

Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-10-14 01:25:26 +00:00
committed by Android (Google) Code Review
parent f89ff85f6c 7c495cbf68
commit 4ebe57804d
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.
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;
}