am c6267735: am f387d3c8: am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev

* commit 'c626773562716168ce710320ce1e36d99fd6664a':
  Place window at top when adding by base layer
This commit is contained in:
Craig Mautner
2015-01-15 03:44:51 +00:00
committed by Android Git Automerger

View File

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