Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6213caa4 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Revert "Revert "WindowList be gone!"" 

This reverts commit ffa5a9de.

Bug: 33098800
Bug: 33098294
Test: Existing tests pass.
Change-Id: I5803a010c5a224dd1cf452a4a7beb3a4c0a043f4
parent 3cf4b56a

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -411,7 +411,7 @@ public class AppWindowAnimator { 
        }

        }

        if (mService.mInputMethodTarget != null

        if (mService.mInputMethodTarget != null

                && mService.mInputMethodTarget.mAppToken == mAppToken) {

                && mService.mInputMethodTarget.mAppToken == mAppToken) {

            mAppToken.getDisplayContent().moveInputMethodWindowsIfNeeded(true);

            mAppToken.getDisplayContent().computeImeTarget(true /* updateImeTarget */);

        }

        }





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

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

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

+27 −16
Original line number Original line Diff line number Diff line
@@ -1003,10 +1003,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
            tStartingWindow.mToken = this;

            tStartingWindow.mToken = this;

            tStartingWindow.mAppToken = this;

            tStartingWindow.mAppToken = this;





            if (DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE || DEBUG_STARTING_WINDOW) Slog.v(TAG_WM,

            if (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);

                    "Removing starting " + tStartingWindow + " from " + fromToken);

            fromToken.removeChild(tStartingWindow);

            fromToken.removeChild(tStartingWindow);

            fromToken.postWindowRemoveStartingWindowCleanup(tStartingWindow);

            fromToken.postWindowRemoveStartingWindowCleanup(tStartingWindow);
@@ -1261,18 +1258,6 @@ 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

    @Override

    boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) {

    boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) {

        // For legacy reasons we process the TaskStack.mExitingAppTokens first in DisplayContent

        // For legacy reasons we process the TaskStack.mExitingAppTokens first in DisplayContent
@@ -1334,6 +1319,32 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        mLastContainsShowWhenLockedWindow = containsShowWhenLocked;

        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

    @Override

    void dump(PrintWriter pw, String prefix) {

    void dump(PrintWriter pw, String prefix) {

        super.dump(pw, prefix);

        super.dump(pw, prefix);