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

Commit b2cfbc4a authored by Louis Chang's avatar Louis Chang
Browse files

Fixes no edge extension in Settings 

This is a regression by commit 75847354. Clicking on the list
items on the primary TF on Settings will start a new and adjacent
secondary TF. In that case, the original secondary TF no longer
has an adjacent TF and therefore is evaluated as a translucent
change.

Skip adding edge extension for translucent Activity only.

Bug: 319169778
Test: verify on Settings
Change-Id: I16311c31f2b83c246e96c2c01975f45011548fa4
parent e799141c

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java

+3 −1
Original line number Diff line number Diff line
@@ -331,7 +331,9 @@ class ActivityEmbeddingAnimationRunner { 
            if (!animation.hasExtension()) {

                continue;

            }

            if (adapter.mChange.hasFlags(FLAG_TRANSLUCENT)) {

            if (adapter.mChange.hasFlags(FLAG_TRANSLUCENT)

                    && adapter.mChange.getActivityComponent() != null) {

                // Skip edge extension for translucent activity.

                continue;

            }

            final TransitionInfo.Change change = adapter.mChange;