Merge "[dev_option] Use DesktopModeFlags from core instead of Shell" into main
This commit is contained in:
@@ -17,10 +17,9 @@
|
||||
package com.android.settings.development;
|
||||
|
||||
import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
|
||||
|
||||
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
|
||||
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
|
||||
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
|
||||
import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
|
||||
import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
|
||||
import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
|
Reference in New Issue
Block a user