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

Commit 2149c477 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Accept a Window as shown if it's in any transition"" into... 

Merge "Revert "Accept a Window as shown if it's in any transition"" into udc-dev am: 2cc23465 am: 89f100c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22784152



Change-Id: I33ea48e9ad93480629024f9c6fa7190915fdee4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 424c35ee 89f100c7

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

+4 −7
Original line number Diff line number Diff line
@@ -1980,19 +1980,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() {