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

Commit 60d50b1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag CUJ_DEFAULT_TASK_TO_TASK_ANIMATION" into main

parents d834246a 129da29b

core/java/android/window/flags/windowing_frontend.aconfig

+12 −0
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ flag { 
    }

}





flag {

    name: "enable_handlers_debugging_mode"

    namespace: "windowing_frontend"
@@ -499,6 +500,17 @@ flag { 
    }

}



flag {

    name: "transition_handler_cuj_tags"

    namespace: "windowing_frontend"

    description: "Add CUJ tags for measuring performance of transition handlers"

    bug: "404190067"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "intercept_motion_from_move_to_cancel"

    namespace: "windowing_frontend"

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

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
        final ArrayList<Animator> animations = new ArrayList<>();

        mAnimations.put(transition, animations);



        final boolean isTaskTransition = isTaskTransition(info);

        final boolean isTaskTransition = com.android.window.flags.Flags.transitionHandlerCujTags()

                && isTaskTransition(info);



        final Runnable onAnimFinish = () -> {

            if (!animations.isEmpty()) return;