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

Commit f9fc3cf1 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 a00c81c1 05cc31a6

quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.quickstep.views.RecentsView 
import com.android.quickstep.views.RecentsViewContainer

import com.android.quickstep.views.TaskContainer

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

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

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



/** A menu item, "Desktop", that allows the user to bring the current app into Desktop Windowing. */

class DesktopSystemShortcut(

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ import com.android.systemui.shared.system.TaskStackChangeListener; 
import com.android.systemui.shared.system.TaskStackChangeListeners;

import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource;

import com.android.wm.shell.common.pip.IPipAnimationListener;

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

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



import kotlin.Unit;

quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.systemui.shared.recents.model.Task 
import com.android.systemui.shared.recents.model.Task.TaskKey

import com.android.window.flags.Flags

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

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

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

import com.google.common.truth.Truth.assertThat

import org.junit.After

import org.junit.Before