Merge "Revert "WindowList be gone!"" (058b69e5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AppWindowAnimator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -411,7 +411,7 @@ public class AppWindowAnimator {
		}
		if (mService.mInputMethodTarget != null
		&& mService.mInputMethodTarget.mAppToken == mAppToken) {
		mAppToken.getDisplayContent().computeImeTarget(true /* updateImeTarget */);
		mAppToken.getDisplayContent().moveInputMethodWindowsIfNeeded(true);
		}

		if (DEBUG_ANIM) Slog.v(TAG, "Animation done in " + mAppToken

services/core/java/com/android/server/wm/AppWindowToken.java

+16 −27

Original line number	Diff line number	Diff line
		@@ -1006,7 +1006,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		tStartingWindow.mToken = this;
		tStartingWindow.mAppToken = this;

		if (DEBUG_ADD_REMOVE \|\| DEBUG_STARTING_WINDOW) Slog.v(TAG_WM,
		if (DEBUG_WINDOW_MOVEMENT \|\| DEBUG_ADD_REMOVE \|\| DEBUG_STARTING_WINDOW) Slog.v(TAG_WM,
		"Removing starting window: " + tStartingWindow);
		getDisplayContent().removeFromWindowList(tStartingWindow);
		if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM,
		"Removing starting " + tStartingWindow + " from " + fromToken);
		fromToken.removeChild(tStartingWindow);
		fromToken.postWindowRemoveStartingWindowCleanup(tStartingWindow);
		@@ -1256,6 +1259,18 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		}
		}

		int rebuildWindowListUnchecked(int addIndex) {
		return super.rebuildWindowList(addIndex);
		}

		@Override
		int rebuildWindowList(int addIndex) {
		if (mIsExiting && !waitingForReplacement()) {
		return addIndex;
		}
		return rebuildWindowListUnchecked(addIndex);
		}

		@Override
		boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) {
		// For legacy reasons we process the TaskStack.mExitingAppTokens first in DisplayContent
		@@ -1317,32 +1332,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		mLastContainsShowWhenLockedWindow = containsShowWhenLocked;
		}

		WindowState getImeTargetBelowWindow(WindowState w) {
		final int index = mChildren.indexOf(w);
		if (index > 0) {
		final WindowState target = mChildren.get(index - 1);
		if (target.canBeImeTarget()) {
		return target;
		}
		}
		return null;
		}

		WindowState getHighestAnimLayerWindow(WindowState currentTarget) {
		WindowState candidate = null;
		for (int i = mChildren.indexOf(currentTarget); i >= 0; i--) {
		final WindowState w = mChildren.get(i);
		if (w.mRemoved) {
		continue;
		}
		if (candidate == null \|\| w.mWinAnimator.mAnimLayer >
		candidate.mWinAnimator.mAnimLayer) {
		candidate = w;
		}
		}
		return candidate;
		}

		@Override
		void dump(PrintWriter pw, String prefix) {
		super.dump(pw, prefix);