Merge "The order of child windows is switched" (58f26e9d) · Commits · e / os / android_frameworks_base

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

+26 −1

Original line number	Diff line number	Diff line
		@@ -314,7 +314,32 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		mSubLayer = mPolicy.subWindowTypeToLayerLw(a.type);
		mAttachedWindow = attachedWindow;
		if (WindowManagerService.DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + mAttachedWindow);

		int children_size = mAttachedWindow.mChildWindows.size();
		if (children_size == 0) {
		mAttachedWindow.mChildWindows.add(this);
		} else {
		for (int i = 0; i < children_size; i++) {
		WindowState child = (WindowState)mAttachedWindow.mChildWindows.get(i);
		if (this.mSubLayer < child.mSubLayer) {
		mAttachedWindow.mChildWindows.add(i, this);
		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()) {
		mAttachedWindow.mChildWindows.add(this);
		}
		}

		mLayoutAttached = mAttrs.type !=
		WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
		mIsImWindow = attachedWindow.mAttrs.type == TYPE_INPUT_METHOD