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

Merge "Add window to child window list with correct order"

Browse Source
This commit is contained in:
Olawale Ogunwale
2014-11-22 02:12:48 +00:00
committed by Gerrit Code Review
parent fc4a7538a6 e2a98a7492
commit f1058308c6
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -386,28 +386,26 @@ final class WindowState implements WindowManagerPolicy.WindowState {
mAttachedWindow = attachedWindow; mAttachedWindow = attachedWindow;
if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + mAttachedWindow); if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + mAttachedWindow);
int children_size = mAttachedWindow.mChildWindows.size(); final WindowList childWindows = mAttachedWindow.mChildWindows;
if (children_size == 0) { final int numChildWindows = childWindows.size();
mAttachedWindow.mChildWindows.add(this); if (numChildWindows == 0) {
childWindows.add(this);
} else { } else {
for (int i = 0; i < children_size; i++) { boolean added = false;
WindowState child = (WindowState)mAttachedWindow.mChildWindows.get(i); for (int i = 0; i < numChildWindows; i++) {
if (this.mSubLayer < child.mSubLayer) { final int childSubLayer = childWindows.get(i).mSubLayer;
mAttachedWindow.mChildWindows.add(i, this); if (mSubLayer < childSubLayer
|| (mSubLayer == childSubLayer && childSubLayer < 0)) {
// We insert the child window into the list ordered by the sub-layer. For
// same sub-layers, the negative one should go below others; the positive
// one should go above others.
childWindows.add(i, this);
added = true;
break; break;
} else if (this.mSubLayer > child.mSubLayer) {
continue;
}
if (this.mBaseLayer <= child.mBaseLayer) {
mAttachedWindow.mChildWindows.add(i, this);
break;
} else {
continue;
} }
} }
if (children_size == mAttachedWindow.mChildWindows.size()) { if (!added) {
mAttachedWindow.mChildWindows.add(this); childWindows.add(this);
} }
} }