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

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

Merge changes Idb61d47c,I626ee944 into main 

* changes:
  Replace assertThat(v).isNotNull with assertNotNull
  Fix the format of argument name comments
parents e736086b fa50a345

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -339,7 +339,7 @@ class DesktopImmersiveController( 
                        .setWindowCrop(leash, endBounds.width(), endBounds.height())

                        .setWindowCrop(leash, endBounds.width(), endBounds.height())

                        .apply()

                        .apply()

                    onTaskResizeAnimationListener?.onAnimationEnd(taskId)

                    onTaskResizeAnimationListener?.onAnimationEnd(taskId)

                    finishCallback.onTransitionFinished(null /* wct */)

                    finishCallback.onTransitionFinished(/* wct= */ null)

                }

                }

            )

            )

            addUpdateListener { animation ->

            addUpdateListener { animation ->

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -306,7 +306,7 @@ class DesktopModeEventLogger { 
    fun logTaskInfoStateInit() {

    fun logTaskInfoStateInit() {

        logTaskUpdate(

        logTaskUpdate(

            FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INIT_STATSD,

            FrameworkStatsLog.DESKTOP_MODE_SESSION_TASK_UPDATE__TASK_EVENT__TASK_INIT_STATSD,

            /* session_id */ 0,

            sessionId = 0,

            TaskUpdate(

            TaskUpdate(

                visibleTaskCount = 0,

                visibleTaskCount = 0,

                instanceId = 0,

                instanceId = 0,

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeVisualIndicator.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -274,7 +274,7 @@ public class DesktopModeVisualIndicator { 
        lp.inputFeatures |= INPUT_FEATURE_NO_INPUT_CHANNEL;

        lp.inputFeatures |= INPUT_FEATURE_NO_INPUT_CHANNEL;

        final WindowlessWindowManager windowManager = new WindowlessWindowManager(

        final WindowlessWindowManager windowManager = new WindowlessWindowManager(

                mTaskInfo.configuration, mLeash,

                mTaskInfo.configuration, mLeash,

                null /* hostInputToken */);

                /* hostInputToken= */ null);

        mViewHost = new SurfaceControlViewHost(mContext,

        mViewHost = new SurfaceControlViewHost(mContext,

                mDisplayController.getDisplay(mTaskInfo.displayId), windowManager,

                mDisplayController.getDisplay(mTaskInfo.displayId), windowManager,

                "DesktopModeVisualIndicator");

                "DesktopModeVisualIndicator");
@@ -338,7 +338,7 @@ public class DesktopModeVisualIndicator { 
        if (mCurrentType == NO_INDICATOR) {

        if (mCurrentType == NO_INDICATOR) {

            fadeInIndicator(newType);

            fadeInIndicator(newType);

        } else if (newType == NO_INDICATOR) {

        } else if (newType == NO_INDICATOR) {

            fadeOutIndicator(null /* finishCallback */);

            fadeOutIndicator(/* finishCallback= */ null);

        } else {

        } else {

            final VisualIndicatorAnimator animator = VisualIndicatorAnimator.animateIndicatorType(

            final VisualIndicatorAnimator animator = VisualIndicatorAnimator.animateIndicatorType(

                    mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId), mCurrentType,

                    mView, mDisplayController.getDisplayLayout(mTaskInfo.displayId), mCurrentType,

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -762,7 +762,7 @@ class DesktopTasksController( 
            return

            return

        }

        }

        val wct = WindowContainerTransaction()

        val wct = WindowContainerTransaction()

        wct.reorder(taskInfo.token, true /* onTop */, true /* includingParents */)

        wct.reorder(taskInfo.token, /* onTop= */ true, /* includingParents= */ true)

        startLaunchTransition(

        startLaunchTransition(

            transitionType = TRANSIT_TO_FRONT,

            transitionType = TRANSIT_TO_FRONT,

            wct = wct,

            wct = wct,
@@ -884,7 +884,7 @@ class DesktopTasksController( 
        } else if (Flags.enableMoveToNextDisplayShortcut()) {

        } else if (Flags.enableMoveToNextDisplayShortcut()) {

            applyFreeformDisplayChange(wct, task, displayId)

            applyFreeformDisplayChange(wct, task, displayId)

        }

        }

        wct.reparent(task.token, displayAreaInfo.token, true /* onTop */)

        wct.reparent(task.token, displayAreaInfo.token, /* onTop= */ true)

        if (Flags.enableDisplayFocusInShellTransitions()) {

        if (Flags.enableDisplayFocusInShellTransitions()) {

            // Bring the destination display to top with includingParents=true, so that the

            // Bring the destination display to top with includingParents=true, so that the

            // destination display gains the display focus, which makes the top task in the display

            // destination display gains the display focus, which makes the top task in the display
@@ -896,7 +896,7 @@ class DesktopTasksController( 
            performDesktopExitCleanupIfNeeded(task.taskId, task.displayId, wct)

            performDesktopExitCleanupIfNeeded(task.taskId, task.displayId, wct)

        }

        }





        transitions.startTransition(TRANSIT_CHANGE, wct, null /* handler */)

        transitions.startTransition(TRANSIT_CHANGE, wct, /* handler= */ null)

    }

    }





    /**

    /**
@@ -1672,7 +1672,7 @@ class DesktopTasksController( 
                requestedTaskId,

                requestedTaskId,

                splitPosition,

                splitPosition,

                options.toBundle(),

                options.toBundle(),

                null, /* hideTaskToken */

                /* hideTaskToken= */ null,

            )

            )

        }

        }

    }

    }
@@ -1709,8 +1709,8 @@ class DesktopTasksController( 
                    fillIn,

                    fillIn,

                    splitPosition,

                    splitPosition,

                    options.toBundle(),

                    options.toBundle(),

                    null /* hideTaskToken */,

                    /* hideTaskToken= */ null,

                    true /* forceLaunchNewTask */,

                    /* forceLaunchNewTask= */ true,

                    splitIndex,

                    splitIndex,

                )

                )

            }

            }
@@ -1961,7 +1961,7 @@ class DesktopTasksController( 
            wct.setBounds(taskInfo.token, initialBounds)

            wct.setBounds(taskInfo.token, initialBounds)

        }

        }

        wct.setWindowingMode(taskInfo.token, targetWindowingMode)

        wct.setWindowingMode(taskInfo.token, targetWindowingMode)

        wct.reorder(taskInfo.token, true /* onTop */)

        wct.reorder(taskInfo.token, /* onTop= */ true)

        if (useDesktopOverrideDensity()) {

        if (useDesktopOverrideDensity()) {

            wct.setDensityDpi(taskInfo.token, DESKTOP_DENSITY_OVERRIDE)

            wct.setDensityDpi(taskInfo.token, DESKTOP_DENSITY_OVERRIDE)

        }

        }
@@ -2796,7 +2796,7 @@ class DesktopTasksController( 
                controller,

                controller,

                "visibleTaskCount",

                "visibleTaskCount",

                { controller -> result[0] = controller.visibleTaskCount(displayId) },

                { controller -> result[0] = controller.visibleTaskCount(displayId) },

                true, /* blocking */

                /* blocking= */ true,

            )

            )

            return result[0]

            return result[0]

        }

        }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ class DesktopTasksLimiter( 
        // If it's a running task, reorder it to back.

        // If it's a running task, reorder it to back.

        taskIdToMinimize

        taskIdToMinimize

            ?.let { shellTaskOrganizer.getRunningTaskInfo(it) }

            ?.let { shellTaskOrganizer.getRunningTaskInfo(it) }

            ?.let { wct.reorder(it.token, false /* onTop */) }

            ?.let { wct.reorder(it.token, /* onTop= */ false) }

        return taskIdToMinimize

        return taskIdToMinimize

    }

    }