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

Commit ff12055d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: f00f197d

Change-Id: I31f70afcb4ea1663c0d2823595ac61264b030cfa
parents 5cd39cdb f00f197d

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