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

Commit 03f91212 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Indicate potential incomplete transition" into udc-dev am: 737f23d1 

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



Change-Id: Iafa6fc2716c3ab60be2a21a7c8f415a753a88119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a1e0965 737f23d1

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

+17 −8
Original line number Diff line number Diff line
@@ -5225,7 +5225,16 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                Debug.getCallers(6));



        // Before setting mVisibleRequested so we can track changes.

        boolean isCollecting = false;

        if (mTransitionController.isShellTransitionsEnabled()) {

            isCollecting = mTransitionController.isCollecting();

            if (isCollecting) {

                mTransitionController.collect(this);

            } else {

                Slog.e(TAG, "setVisibility=" + visible + " while transition is not collecting "

                        + this + " caller=" + Debug.getCallers(8));

            }

        }



        onChildVisibilityRequested(visible);
@@ -5297,9 +5306,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }



        // Defer committing visibility until transition starts.

        if (inTransition()) {

            if (!visible && mTransitionController.inPlayingTransition(this)

                    && mTransitionController.isCollecting(this)) {

        if (isCollecting) {

            // It may be occluded by the activity above that calls convertFromTranslucent().

            if (!visible && mTransitionController.inPlayingTransition(this)) {

                mTransitionChangeFlags |= FLAG_IS_OCCLUDED;

            }

            return;
@@ -5319,11 +5328,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * Then its visibility will be committed until the transition is ready.

     */

    private boolean deferCommitVisibilityChange(boolean visible) {

        if (!mDisplayContent.mAppTransition.isTransitionSet()) {

        if (mTransitionController.isShellTransitionsEnabled()) {

            // Shell transition doesn't use opening/closing sets.

            return false;

        }

        if (!mDisplayContent.mAppTransition.isTransitionSet()) {

            // Defer committing visibility for non-home app which is animating by recents.

            if (isActivityTypeHome() || !isAnimating(PARENTS, ANIMATION_TYPE_RECENTS)) {

                return false;