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

Commit 9aa90a3b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22648062']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22648062'] into tm-qpr3-c-release.

Change-Id: Ib39757d26f2b2f0326747f96653467e6a3e69ab8
parents 8b19fe5e 9ee3a318

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

+4 −7
Original line number Diff line number Diff line
@@ -2053,19 +2053,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    /**

     * Like isOnScreen(), but we don't return true if the window is part

     * of a transition but has not yet started animating.

     * of a transition that has not yet been started.

     */

    boolean isReadyForDisplay() {

        if (!mHasSurface || mDestroying || !isVisibleByPolicy()) {

            return false;

        }

        if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()

                && !isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_APP_TRANSITION)) {

        if (mToken.waitingToShow && getDisplayContent().mAppTransition.isTransitionSet()) {

            return false;

        }

        final boolean parentAndClientVisible = !isParentWindowHidden()

                && mViewVisibility == View.VISIBLE && mToken.isVisible();

        return parentAndClientVisible || isAnimating(TRANSITION | PARENTS, ANIMATION_TYPE_ALL);

        return mHasSurface && isVisibleByPolicy() && !mDestroying

                && (parentAndClientVisible || isAnimating(TRANSITION | PARENTS));

    }



    boolean isFullyTransparent() {