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

Commit 3d460a1e authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Do not add edge extension if the container is translucent" into main

parents 6b300d7a 75847354

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

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE; 
import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManagerPolicyConstants.TYPE_LAYER_OFFSET;

import static android.window.TransitionInfo.FLAG_IS_BEHIND_STARTING_WINDOW;

import static android.window.TransitionInfo.FLAG_TRANSLUCENT;



import static com.android.wm.shell.activityembedding.ActivityEmbeddingAnimationSpec.createShowSnapshotForClosingAnimation;

import static com.android.wm.shell.transition.TransitionAnimationHelper.addBackgroundToTransition;
@@ -330,6 +331,9 @@ class ActivityEmbeddingAnimationRunner { 
            if (!animation.hasExtension()) {

                continue;

            }

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

                continue;

            }

            final TransitionInfo.Change change = adapter.mChange;

            if (TransitionUtil.isOpeningType(adapter.mChange.getMode())) {

                // Need to screenshot after startTransaction is applied otherwise activity