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

Merge "Place window at top when adding by base layer" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2015-01-14 20:46:22 +00:00
committed by Android (Google) Code Review
parent 94e30215f9 cfb13798db
commit c8ba2e87a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -1166,15 +1166,15 @@ public class WindowManagerService extends IWindowManager.Stub
// Just search for the start of this layer. // Just search for the start of this layer.
final int myLayer = win.mBaseLayer; final int myLayer = win.mBaseLayer;
int i; int i;
for (i = 0; i < N; i++) { for (i = N - 1; i >= 0; --i) {
WindowState w = windows.get(i); WindowState w = windows.get(i);
if (w.mBaseLayer > myLayer) { if (w.mBaseLayer <= myLayer) {
break; break;
} }
} }
if (true || DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, if (true || DEBUG_FOCUS_LIGHT || DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG,
"Based on layer: Adding window " + win + " at " + i + " of " + N); "Based on layer: Adding window " + win + " at " + (i + 1) + " of " + N);
windows.add(i, win); windows.add(i + 1, win);
mWindowsChanged = true; mWindowsChanged = true;
return tokenWindowsPos; return tokenWindowsPos;
} }