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

Commit f00f197d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Only consider gone for layout if parent is gone for layout" into qt-r1-dev

parents c7b15079 b52b0457

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

+6 −1
Original line number Diff line number Diff line
@@ -1633,7 +1633,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                || !mRelayoutCalled

                || (atoken == null && mToken.isHidden())

                || (atoken != null && atoken.hiddenRequested)

                || isParentWindowHidden()

                || isParentWindowGoneForLayout()

                || (mAnimatingExit && !isAnimatingLw())

                || mDestroying;

    }
@@ -3840,6 +3840,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        return parent != null && parent.mHidden;

    }



    private boolean isParentWindowGoneForLayout() {

        final WindowState parent = getParentWindow();

        return parent != null && parent.isGoneForLayoutLw();

    }



    void setWillReplaceWindow(boolean animate) {

        for (int i = mChildren.size() - 1; i >= 0; i--) {

            final WindowState c = mChildren.get(i);