From 76bbdd58ab850e0a65e55ef24bf209b98c9c14e3 Mon Sep 17 00:00:00 2001 From: Alina Zaidi Date: Wed, 18 Sep 2024 17:53:20 +0000 Subject: [PATCH] [dev_option] Use DesktopModeFlags from core instead of Shell Test: Current tests pass Bug: 368055148 Flag: EXEMPT refactoring Change-Id: I5f40bd1e00c0fdddfdeefc886e691c9b732387b8 --- .../DesktopModePreferenceController.java | 13 ++++++------- .../DesktopModePreferenceControllerTest.java | 7 +++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java index 3f8ddabb9ba..f43e17cca86 100644 --- a/src/com/android/settings/development/DesktopModePreferenceController.java +++ b/src/com/android/settings/development/DesktopModePreferenceController.java @@ -17,14 +17,14 @@ 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.convertToToggleOverrideWithFallback; -import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; -import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; -import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET; +import static android.window.flags.DesktopModeFlags.ToggleOverride.fromSetting; +import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; +import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; +import static android.window.flags.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET; import android.content.Context; import android.provider.Settings; +import android.window.flags.DesktopModeFlags.ToggleOverride; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +34,6 @@ import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; /** @@ -84,7 +83,7 @@ public class DesktopModePreferenceController extends DeveloperOptionsPreferenceC // Use overridden state, if not present, then use default state final int overrideInt = Settings.Global.getInt(mContext.getContentResolver(), DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting()); - final ToggleOverride toggleOverride = convertToToggleOverrideWithFallback(overrideInt, + final ToggleOverride toggleOverride = fromSetting(overrideInt, OVERRIDE_UNSET); final boolean shouldDevOptionBeEnabled = switch (toggleOverride) { case OVERRIDE_OFF -> false; diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index 0fd4d8546fa..7fe937729b6 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -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;