am 5ab73bec: am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev (59cd8d70) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wm/WindowManagerService.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}