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

Commit e1904df9 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Android (Google) Code Review
Browse files

Merge "Create /desktopmode/desktopfirst" into main

parents 7a79cec7 e847eca9

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

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import com.android.wm.shell.desktopmode.CloseDesktopTaskTransitionHandler; 
import com.android.wm.shell.desktopmode.DefaultDragToDesktopTransitionHandler;

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

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

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

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

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

import com.android.wm.shell.desktopmode.DesktopMinimizationTransitionHandler;
@@ -116,6 +115,7 @@ import com.android.wm.shell.desktopmode.SpringDragToDesktopTransitionHandler; 
import com.android.wm.shell.desktopmode.ToggleResizeDesktopTaskTransitionHandler;

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

import com.android.wm.shell.desktopmode.compatui.SystemModalsTransitionHandler;

import com.android.wm.shell.desktopmode.desktopfirst.DesktopDisplayModeController;

import com.android.wm.shell.desktopmode.desktopwallpaperactivity.DesktopWallpaperActivityTokenProvider;

import com.android.wm.shell.desktopmode.education.AppHandleEducationController;

import com.android.wm.shell.desktopmode.education.AppHandleEducationFilter;

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.internal.protolog.ProtoLog 
import com.android.wm.shell.RootTaskDisplayAreaOrganizer

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayController.OnDisplaysChangedListener

import com.android.wm.shell.desktopmode.desktopfirst.DesktopDisplayModeController

import com.android.wm.shell.desktopmode.multidesks.DesksOrganizer

import com.android.wm.shell.desktopmode.multidesks.DesksTransitionObserver

import com.android.wm.shell.desktopmode.multidesks.OnDeskDisplayChangeListener

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

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ import com.android.wm.shell.desktopmode.DragToDesktopTransitionHandler.DragToDes 
import com.android.wm.shell.desktopmode.EnterDesktopTaskTransitionHandler.FREEFORM_ANIMATION_DURATION

import com.android.wm.shell.desktopmode.ExitDesktopTaskTransitionHandler.FULLSCREEN_ANIMATION_DURATION

import com.android.wm.shell.desktopmode.common.ToggleTaskSizeInteraction

import com.android.wm.shell.desktopmode.desktopfirst.isDisplayDesktopFirst

import com.android.wm.shell.desktopmode.desktopwallpaperactivity.DesktopWallpaperActivityTokenProvider

import com.android.wm.shell.desktopmode.minimize.DesktopWindowLimitRemoteHandler

import com.android.wm.shell.desktopmode.multidesks.DeskTransition

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopDisplayModeController.kt→libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/desktopfirst/DesktopDisplayModeController.kt

+1 −1
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.desktopmode.desktopfirst



import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD

import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopFirstUtils.kt→libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/desktopfirst/DesktopFirstUtils.kt

+1 −1
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.desktopmode.desktopfirst



import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM

import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN