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

Commit 33049b29 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Accept a Window as shown if it's in any transition" into udc-dev am:... 

Merge "Accept a Window as shown if it's in any transition" into udc-dev am: a27edf5a am: 11077e04

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



Change-Id: Ie16a5a0ac3d085a9e17ab429d6d5270ffd12b27a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1799fe40 11077e04

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

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




    /**

    /**

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

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

     * of a transition that has not yet been started.

     * of a transition but has not yet started animating.

     */

     */

    boolean isReadyForDisplay() {

    boolean isReadyForDisplay() {

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

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

            return false;

        }

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

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

            return false;

            return false;

        }

        }

        final boolean parentAndClientVisible = !isParentWindowHidden()

        final boolean parentAndClientVisible = !isParentWindowHidden()

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

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

        return mHasSurface && isVisibleByPolicy() && !mDestroying

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

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

    }

    }





    boolean isFullyTransparent() {

    boolean isFullyTransparent() {