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

Commit 68cd2281 authored by wilsonshih's avatar wilsonshih
Browse files

Only set edge extension when fill_task or embedded_activity flag is set 

Do not apply edge extensiion effect on letterboxed activity during
transition animation. Because the animation offset can be zero, check
bounds should be more reliable.

Flag: EXEMPT bugfix
Bug: 409896188
Test: verify no edge extension when opening activity in compat mode.
Test: atest ActivityTransitionTests
Change-Id: I931524f29c106997578725f32847f0531e356e93
parent 6e14ced4

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);