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

Commit d74c5018 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Don't include invisible transientlaunches in transitions" into main

parents 6038dd56 fca32a78

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

+3 −3
Original line number Diff line number Diff line
@@ -3498,14 +3498,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        boolean hasChanged() {

            final boolean currVisible = mContainer.isVisibleRequested();

            // the task including transient launch must promote to root task

            if ((mFlags & ChangeInfo.FLAG_TRANSIENT_LAUNCH) != 0

                    || (mFlags & ChangeInfo.FLAG_ABOVE_TRANSIENT_LAUNCH) != 0) {

            if (currVisible && ((mFlags & ChangeInfo.FLAG_TRANSIENT_LAUNCH) != 0

                    || (mFlags & ChangeInfo.FLAG_ABOVE_TRANSIENT_LAUNCH) != 0)) {

                return true;

            }

            // If it's invisible and hasn't changed visibility, always return false since even if

            // something changed, it wouldn't be a visible change.

            final boolean currVisible = mContainer.isVisibleRequested();

            if (currVisible == mVisible && !mVisible) return false;

            return currVisible != mVisible

                    || mKnownConfigChanges != 0