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

Commit 8cef50e4 authored by Ben Lin's avatar Ben Lin
Browse files

Desktop -> Split: Don't set windowing mode changes on the wcts. 

For historical reasons, we used to set windowing mode changes as we
start these transitions and even on animation callbacks. However now we
don't need them anymore, and setting them actually causes some issue as
now pre-split-select tasks are getting forwarded to no TaskListeners
since we don't have any TaskListeners for Multi Window type windows.
Similarly explicitly setting UNDEFINED to the task after the
split-select animation finishes is unnecessary, given it never changed
windowing mode.

Bug: 410838192
Test: Check for DMWindowDecor callbacks for layout, see a visibility change callback now when drag-to-split-select
Flag: com.android.window.flags.enable_input_layer_transition_fix
Change-Id: I6bbbc79578b6a4df3f3b31806ca1daff7bab0c17
parent c7b882bc

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

+3 −1
Original line number Diff line number Diff line
@@ -953,7 +953,9 @@ class DesktopTasksController( 
    fun onDesktopSplitSelectAnimComplete(taskInfo: RunningTaskInfo) {

        val wct = WindowContainerTransaction()

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

        if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {

            wct.setWindowingMode(taskInfo.token, WINDOWING_MODE_UNDEFINED)

        }

        shellTaskOrganizer.applyTransaction(wct)

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -350,7 +350,9 @@ sealed class DragToDesktopTransitionHandler( 
            )

            splitScreenController.transitionHandler.onSplitToDesktop()

        }

        if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {

            wct.setWindowingMode(taskInfo.token, WINDOWING_MODE_MULTI_WINDOW)

        }

        wct.setDensityDpi(taskInfo.token, context.resources.displayMetrics.densityDpi)

        splitScreenController.requestEnterSplitSelect(taskInfo, wct, splitPosition, taskBounds)

    }