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

Commit 60ce8666 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "[Dev option] Move DesktopModesStatus to wm/shell/shared/desktopmode... 

Merge "[Dev option] Move DesktopModesStatus to wm/shell/shared/desktopmode from wm/shell/shared/" into main
parents cbddc05c 9666ea6f

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

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context 
import android.provider.Settings

import android.util.Log

import com.android.window.flags.Flags

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



/*

 * A shared class to check desktop mode flags state.

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

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

 */



package com.android.wm.shell.shared;

package com.android.wm.shell.shared.desktopmode;



import android.annotation.NonNull;

import android.content.Context;
@@ -23,7 +23,6 @@ import android.os.SystemProperties; 
import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.window.flags.Flags;

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags;



/**

 * Constants for desktop mode feature

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

+3 −3
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ 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.recents.TaskStackTransitionObserver;

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;

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

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

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

import com.android.wm.shell.splitscreen.SplitScreen;

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

import com.android.wm.shell.startingsurface.StartingSurface;

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

+1 −1
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ 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;

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

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

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_ 
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT

import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG

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

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

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

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

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

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