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

Commit fdfe3a2f authored by ELIYAZ MOMIN (xWF)'s avatar ELIYAZ MOMIN (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Add jank metric to move to next display shortcut" 

Revert submission 31790514-move-to-next-jank-metric

Reason for revert: <Potential culprit for  b/402072785  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted>

Reverted changes: /q/submissionid:31790514-move-to-next-jank-metric

Change-Id: I76c064f35fdcac816d5f3a7c908e63a491914354
parent 511e1fa5

core/java/com/android/internal/jank/Cuj.java

+2 −14
Original line number Original line Diff line number Diff line
@@ -313,17 +313,8 @@ public class Cuj { 
     */

     */

    public static final int CUJ_DEFAULT_TASK_TO_TASK_ANIMATION = 128;

    public static final int CUJ_DEFAULT_TASK_TO_TASK_ANIMATION = 128;





    /**

     * Track moving a window to another display in Desktop Windowing mode.

     *

     * <p>Tracking starts when the DesktopModeMoveToDisplayTransitionHandler starts animating the

     * task to move it to another display. This is triggered when the user presses a keyboard

     * shortcut or clicks the menu in the overview. Tracking ends when the animation completes.</p>

     */

    public static final int CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY = 129;



    // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.

    // When adding a CUJ, update this and make sure to also update CUJ_TO_STATSD_INTERACTION_TYPE.

    @VisibleForTesting static final int LAST_CUJ = CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY;

    @VisibleForTesting static final int LAST_CUJ = CUJ_DEFAULT_TASK_TO_TASK_ANIMATION;





    /** @hide */

    /** @hide */

    @IntDef({

    @IntDef({
@@ -443,8 +434,7 @@ public class Cuj { 
            CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH,

            CUJ_DESKTOP_MODE_KEYBOARD_QUICK_SWITCH_APP_LAUNCH,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_EXPAND,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK,

            CUJ_LAUNCHER_WORK_UTILITY_VIEW_SHRINK,

            CUJ_DEFAULT_TASK_TO_TASK_ANIMATION,

            CUJ_DEFAULT_TASK_TO_TASK_ANIMATION

            CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {}

    public @interface CujType {}
@@ -827,8 +817,6 @@ public class Cuj { 
                return "LAUNCHER_WORK_UTILITY_VIEW_SHRINK";

                return "LAUNCHER_WORK_UTILITY_VIEW_SHRINK";

            case CUJ_DEFAULT_TASK_TO_TASK_ANIMATION:

            case CUJ_DEFAULT_TASK_TO_TASK_ANIMATION:

                return "DEFAULT_TASK_TO_TASK_ANIMATION";

                return "DEFAULT_TASK_TO_TASK_ANIMATION";

            case CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY:

                return "DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY";

        }

        }

        return "UNKNOWN";

        return "UNKNOWN";

    }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −9
Original line number Original line Diff line number Diff line
@@ -954,15 +954,8 @@ public abstract class WMShellModule { 




    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    static DesktopModeMoveToDisplayTransitionHandler provideMoveToDisplayTransitionHandler(

    static DesktopModeMoveToDisplayTransitionHandler provideMoveToDisplayTransitionHandler() {

            InteractionJankMonitor interactionJankMonitor,

        return new DesktopModeMoveToDisplayTransitionHandler(new SurfaceControl.Transaction());

            @ShellMainThread Handler shellMainHandler,

            DisplayController displayController) {

        return new DesktopModeMoveToDisplayTransitionHandler(

                new SurfaceControl.Transaction(),

                interactionJankMonitor,

                shellMainHandler,

                displayController);

    }

    }





    @WMSingleton

    @WMSingleton

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeMoveToDisplayTransitionHandler.kt

+2 −22
Original line number Original line Diff line number Diff line
@@ -19,26 +19,19 @@ package com.android.wm.shell.desktopmode 
import android.animation.Animator

import android.animation.Animator

import android.animation.AnimatorSet

import android.animation.AnimatorSet

import android.animation.ValueAnimator

import android.animation.ValueAnimator

import android.os.Handler

import android.os.IBinder

import android.os.IBinder

import android.view.Choreographer

import android.view.Choreographer

import android.view.SurfaceControl

import android.view.SurfaceControl

import android.window.TransitionInfo

import android.window.TransitionInfo

import android.window.TransitionRequestInfo

import android.window.TransitionRequestInfo

import android.window.WindowContainerTransaction

import android.window.WindowContainerTransaction

import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY

import com.android.internal.jank.InteractionJankMonitor

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.shared.animation.Interpolators

import com.android.wm.shell.shared.animation.Interpolators

import com.android.wm.shell.transition.Transitions

import com.android.wm.shell.transition.Transitions

import kotlin.time.Duration.Companion.milliseconds

import kotlin.time.Duration.Companion.milliseconds





/** Transition handler for moving a window to a different display. */

/** Transition handler for moving a window to a different display. */

class DesktopModeMoveToDisplayTransitionHandler(

class DesktopModeMoveToDisplayTransitionHandler(

    private val animationTransaction: SurfaceControl.Transaction,

    private val animationTransaction: SurfaceControl.Transaction

    private val interactionJankMonitor: InteractionJankMonitor,

    private val shellMainHandler: Handler,

    private val displayController: DisplayController,

) : Transitions.TransitionHandler {

) : Transitions.TransitionHandler {





    override fun handleRequest(

    override fun handleRequest(
@@ -81,31 +74,18 @@ class DesktopModeMoveToDisplayTransitionHandler( 
                }

                }

            }

            }

        )

        )



        animator.addListener(

        animator.addListener(

            object : Animator.AnimatorListener {

            object : Animator.AnimatorListener {

                override fun onAnimationStart(animation: Animator) {

                override fun onAnimationStart(animation: Animator) = Unit

                    val displayContext =

                        displayController.getDisplayContext(changes[0].endDisplayId)

                    if (displayContext == null) return

                    interactionJankMonitor.begin(

                        changes[0].leash,

                        displayContext,

                        shellMainHandler,

                        CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY,

                    )

                }





                override fun onAnimationEnd(animation: Animator) {

                override fun onAnimationEnd(animation: Animator) {

                    finishTransaction.apply()

                    finishTransaction.apply()

                    finishCallback.onTransitionFinished(null)

                    finishCallback.onTransitionFinished(null)

                    interactionJankMonitor.end(CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY)

                }

                }





                override fun onAnimationCancel(animation: Animator) {

                override fun onAnimationCancel(animation: Animator) {

                    finishTransaction.apply()

                    finishTransaction.apply()

                    finishCallback.onTransitionFinished(null)

                    finishCallback.onTransitionFinished(null)

                    interactionJankMonitor.cancel(CUJ_DESKTOP_MODE_MOVE_WINDOW_TO_DISPLAY)

                }

                }





                override fun onAnimationRepeat(animation: Animator) = Unit

                override fun onAnimationRepeat(animation: Animator) = Unit

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeMoveToDisplayTransitionHandlerTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -43,8 +43,7 @@ class DesktopModeMoveToDisplayTransitionHandlerTest : ShellTestCase() { 




    @Before

    @Before

    fun setUp() {

    fun setUp() {

        handler =

        handler = DesktopModeMoveToDisplayTransitionHandler(StubTransaction())

            DesktopModeMoveToDisplayTransitionHandler(StubTransaction(), mock(), mock(), mock())

    }

    }





    @Test

    @Test