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

Commit bf67ef20 authored by mattsziklay's avatar mattsziklay Committed by Matt Sziklay
Browse files

Rename split select callback. 

The split select callback is no longer used on anim complete, instead it
is used when an option is selected that results in a task launch. This
CL renames the function name to reflect this.

Bug: 419022969
Test: Manual
Flag: EXEMPT, refactor
Change-Id: Iee2b75314e5d4e2fdfc0cbd68bb0df0ff8c69730
parent 9a368d9b

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

+5 −6
Original line number Diff line number Diff line
@@ -1516,7 +1516,7 @@ class DesktopTasksController( 
     *

     * @param taskInfo task entering split that requires a bounds update

     */

    fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {

    fun onDesktopSplitSelectChoice(taskInfo: RunningTaskInfo) {

        val wct = WindowContainerTransaction()

        wct.setBounds(taskInfo.token, Rect())

        if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {
@@ -4599,7 +4599,7 @@ class DesktopTasksController( 


    /**

     * Adds split screen changes to a transaction. Note that bounds are not reset here due to

     * animation; see {@link onDesktopSplitSelectAnimComplete}

     * animation; see {@link onDesktopSplitSelectChoice}

     */

    private fun addMoveToSplitChanges(wct: WindowContainerTransaction, taskInfo: RunningTaskInfo) {

        if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {
@@ -6219,10 +6219,9 @@ class DesktopTasksController( 
            )

        }



        override fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {

            executeRemoteCallWithTaskPermission(controller, "onDesktopSplitSelectAnimComplete") { c

                ->

                c.onDesktopSplitSelectAnimComplete(taskInfo)

        override fun onDesktopSplitSelectChoice(taskInfo: RunningTaskInfo) {

            executeRemoteCallWithTaskPermission(controller, "onDesktopSplitSelectChoice") { c ->

                c.onDesktopSplitSelectChoice(taskInfo)

            }

        }

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/IDesktopMode.aidl

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ interface IDesktopMode { 
    oneway void moveToFullscreen(int taskId, in DesktopModeTransitionSource transitionSource,

            in @nullable RemoteTransition remoteTransition);



    /** Perform cleanup transactions after the animation to split select is complete */

    oneway void onDesktopSplitSelectAnimComplete(in RunningTaskInfo taskInfo);

    /** Perform cleanup transactions after choosing a split select task launch option. */

    oneway void onDesktopSplitSelectChoice(in RunningTaskInfo taskInfo);



    /** Set listener that will receive callbacks about updates to desktop tasks */

    oneway void setTaskListener(IDesktopTaskListener listener);