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

Commit d11476c6 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "[1/n] Unify `DesktopModeStatus` between Shell and Sysui" into main

parents c56d4ecf 67d780f9

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeStatus.java→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.desktopmode;

package com.android.wm.shell.shared;



import android.annotation.NonNull;

import android.content.Context;
@@ -127,7 +127,7 @@ public class DesktopModeStatus { 
    /**

     * Return the maximum limit on the number of Tasks to show in Desktop Mode at any one time.

     */

    static int getMaxTaskLimit() {

    public static int getMaxTaskLimit() {

        return MAX_TASK_LIMIT;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ import com.android.wm.shell.compatui.CompatUIConfiguration; 
import com.android.wm.shell.compatui.CompatUIController;

import com.android.wm.shell.compatui.CompatUIShellCommandHandler;

import com.android.wm.shell.desktopmode.DesktopMode;

import com.android.wm.shell.desktopmode.DesktopModeStatus;

import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.displayareahelper.DisplayAreaHelper;
@@ -88,6 +87,7 @@ import com.android.wm.shell.performance.PerfHintController; 
import com.android.wm.shell.recents.RecentTasks;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;

import com.android.wm.shell.shared.DesktopModeStatus;

import com.android.wm.shell.shared.ShellTransitions;

import com.android.wm.shell.shared.annotations.ShellAnimationThread;

import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import com.android.wm.shell.dagger.back.ShellBackAnimationModule; 
import com.android.wm.shell.dagger.pip.PipModule;

import com.android.wm.shell.desktopmode.DesktopModeEventLogger;

import com.android.wm.shell.desktopmode.DesktopModeLoggerTransitionObserver;

import com.android.wm.shell.desktopmode.DesktopModeStatus;

import com.android.wm.shell.desktopmode.DesktopModeTaskRepository;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.desktopmode.DesktopTasksLimiter;
@@ -77,6 +76,7 @@ import com.android.wm.shell.onehanded.OneHandedController; 
import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;

import com.android.wm.shell.shared.DesktopModeStatus;

import com.android.wm.shell.shared.annotations.ShellAnimationThread;

import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

import com.android.wm.shell.shared.annotations.ShellMainThread;

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.EnterRe 
import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ExitReason

import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.TaskUpdate

import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE

import com.android.wm.shell.shared.DesktopModeStatus

import com.android.wm.shell.shared.TransitionUtil

import com.android.wm.shell.sysui.ShellInit

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

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.wm.shell.draganddrop.DragAndDropController 
import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE

import com.android.wm.shell.recents.RecentsTransitionHandler

import com.android.wm.shell.recents.RecentsTransitionStateListener

import com.android.wm.shell.shared.DesktopModeStatus

import com.android.wm.shell.shared.annotations.ExternalThread

import com.android.wm.shell.shared.annotations.ShellMainThread

import com.android.wm.shell.splitscreen.SplitScreenController