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

Commit 207534fa authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Only set edge extension when fill_task or embedded_activity flag is set" into main

parents 450f4049 68cd2281

core/java/android/window/TransitionInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public final class TransitionInfo implements Parcelable { 


    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = { "FLAG_" }, value = {

    @IntDef(prefix = { "FLAG_" }, flag = true, value = {

            FLAG_NONE,

            FLAG_SHOW_WALLPAPER,

            FLAG_IS_WALLPAPER,

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -592,7 +592,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                    animRelOffset.y = Math.max(animRelOffset.y, change.getEndRelOffset().y);

                }

                if (!isTask && a.getExtensionEdges() != 0x0

                        && animRelOffset.x == 0 && animRelOffset.y == 0) {

                        && (change.hasFlags(FLAG_FILLS_TASK

                        | FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY))) {

                    startTransaction.setEdgeExtensionEffect(

                            change.getLeash(), a.getExtensionEdges());

                    finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);