From cc3eac9b7ca9d5869874f879ec2988542f16e3d5 Mon Sep 17 00:00:00 2001 From: Alina Zaidi Date: Tue, 1 Oct 2024 18:29:14 +0000 Subject: [PATCH] [dev_option] Move DestopModeFlags out of android.windows.flags This is to maintain separation of non-generated files from generated flag values. Test: Current tests pass Flag: EXEMPT refactoring Bug: 370777204 Change-Id: I6588ebec59519b4e0d6c83057b8106c20a3df8fa --- .../development/DesktopModePreferenceController.java | 10 +++++----- .../DesktopModePreferenceControllerTest.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java index f43e17cca86..492686ead65 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 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 static android.window.DesktopModeFlags.ToggleOverride.fromSetting; +import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; +import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; +import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET; import android.content.Context; import android.provider.Settings; -import android.window.flags.DesktopModeFlags.ToggleOverride; +import android.window.DesktopModeFlags.ToggleOverride; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index 7fe937729b6..b9f56215de1 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -17,9 +17,9 @@ package com.android.settings.development; import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES; -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 android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON; +import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF; +import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET; import static com.google.common.truth.Truth.assertThat;