From bf50c0baef56fe50775b0c885c50f03ee9662123 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 23 Jan 2025 20:38:30 +0000
Subject: [PATCH] Create new sections for developer options

To group desktop experience and window management options

Test: Build and check
Bug: 390625230
Flag: EXEMPT (refactor)

Change-Id: Ie076501da68045fa5f1098423a42d32f16a02838
---
 res/xml/development_settings.xml              | 68 +++++++++++--------
 .../DevelopmentSettingsDashboardFragment.java |  6 ++
 ...DesktopExperiencePreferenceController.java |  5 +-
 .../DesktopModePreferenceController.java      |  5 +-
 ...eSecondaryDisplayPreferenceController.java |  5 +-
 .../FreeformWindowsPreferenceController.java  |  5 +-
 .../development/desktopexperience/OWNERS      |  3 +
 ...izableMultiWindowPreferenceController.java |  2 +-
 .../settings/development/window/OWNERS        |  2 +
 ...ResizableActivityPreferenceController.java |  6 +-
 ...topExperiencePreferenceControllerTest.java |  4 +-
 .../DesktopModePreferenceControllerTest.java  |  4 +-
 ...ondaryDisplayPreferenceControllerTest.java | 14 ++--
 ...eeformWindowsPreferenceControllerTest.java |  8 ++-
 .../development/desktopexperience/OWNERS      |  2 +
 ...leMultiWindowPreferenceControllerTest.java |  6 +-
 .../settings/development/window/OWNERS        |  3 +
 ...zableActivityPreferenceControllerTest.java |  4 +-
 18 files changed, 98 insertions(+), 54 deletions(-)
 rename src/com/android/settings/development/{ => desktopexperience}/DesktopExperiencePreferenceController.java (94%)
 rename src/com/android/settings/development/{ => desktopexperience}/DesktopModePreferenceController.java (93%)
 rename src/com/android/settings/development/{ => desktopexperience}/DesktopModeSecondaryDisplayPreferenceController.java (93%)
 rename src/com/android/settings/development/{ => desktopexperience}/FreeformWindowsPreferenceController.java (92%)
 create mode 100644 src/com/android/settings/development/desktopexperience/OWNERS
 rename src/com/android/settings/development/{ => window}/NonResizableMultiWindowPreferenceController.java (98%)
 create mode 100644 src/com/android/settings/development/window/OWNERS
 rename src/com/android/settings/development/{ => window}/ResizableActivityPreferenceController.java (94%)
 rename tests/robotests/src/com/android/settings/development/{ => desktopexperience}/DesktopExperiencePreferenceControllerTest.java (97%)
 rename tests/robotests/src/com/android/settings/development/{ => desktopexperience}/DesktopModePreferenceControllerTest.java (97%)
 rename tests/robotests/src/com/android/settings/development/{ => desktopexperience}/DesktopModeSecondaryDisplayPreferenceControllerTest.java (91%)
 rename tests/robotests/src/com/android/settings/development/{ => desktopexperience}/FreeformWindowsPreferenceControllerTest.java (93%)
 create mode 100644 tests/robotests/src/com/android/settings/development/desktopexperience/OWNERS
 rename tests/robotests/src/com/android/settings/development/{ => window}/NonResizableMultiWindowPreferenceControllerTest.java (93%)
 create mode 100644 tests/robotests/src/com/android/settings/development/window/OWNERS
 rename tests/robotests/src/com/android/settings/development/{ => window}/ResizableActivityPreferenceControllerTest.java (98%)

diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 2f9a9b98585..518e2d16e73 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -745,32 +745,6 @@
             android:title="@string/force_allow_on_external"
             android:summary="@string/force_allow_on_external_summary" />
 
-        <SwitchPreferenceCompat
-            android:key="force_resizable_activities"
-            android:title="@string/force_resizable_activities"
-            android:summary="@string/force_resizable_activities_summary" />
-
-        <SwitchPreferenceCompat
-            android:key="override_desktop_mode_features"
-            android:title="@string/enable_desktop_mode" />
-
-        <SwitchPreferenceCompat
-            android:key="enable_freeform_support"
-            android:title="@string/enable_freeform_support" />
-
-        <SwitchPreferenceCompat
-            android:key="override_desktop_experience_features"
-            android:title="@string/enable_desktop_experience_features"/>
-
-        <SwitchPreferenceCompat
-            android:key="force_desktop_mode_on_external_displays"
-            android:title="@string/enable_desktop_mode_on_secondary_display"/>
-
-        <SwitchPreferenceCompat
-            android:key="enable_non_resizable_multi_window"
-            android:title="@string/enable_non_resizable_multi_window"
-            android:summary="@string/enable_non_resizable_multi_window_summary" />
-
         <SwitchPreferenceCompat
             android:key="back_navigation_animation"
             android:title="@string/back_navigation_animation"
@@ -792,11 +766,45 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:key="window_management_category"
+        android:title="@string/window_management_category"
+        android:order="1100">
+
+        <SwitchPreferenceCompat
+            android:key="force_resizable_activities"
+            android:title="@string/force_resizable_activities"
+            android:summary="@string/force_resizable_activities_summary" />
+
+        <SwitchPreferenceCompat
+            android:key="enable_non_resizable_multi_window"
+            android:title="@string/enable_non_resizable_multi_window"
+            android:summary="@string/enable_non_resizable_multi_window_summary" />
+
+        <SwitchPreferenceCompat
+            android:key="override_desktop_mode_features"
+            android:title="@string/enable_desktop_mode" />
+
+        <SwitchPreferenceCompat
+            android:key="enable_freeform_support"
+            android:title="@string/enable_freeform_support" />
+
+        <SwitchPreferenceCompat
+            android:key="override_desktop_experience_features"
+            android:title="@string/enable_desktop_experience_features"/>
+
+        <SwitchPreferenceCompat
+            android:key="force_desktop_mode_on_external_displays"
+            android:title="@string/enable_desktop_mode_on_secondary_display"/>
+
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:key="debug_autofill_category"
         android:title="@string/debug_autofill_category"
         settings:searchable="false"
-        android:order="1100"> <!-- Incremented by 100 from last order (i.e. 1000) -->
+        android:order="1200"> <!-- Incremented by 100 from last order (i.e. 1000) -->
 
         <ListPreference
             android:key="autofill_logging_level"
@@ -821,7 +829,7 @@
     <PreferenceCategory
         android:key="storage_category"
         android:title="@string/storage_category"
-        android:order="1200">
+        android:order="1300">
 
         <Preference
             android:key="shared_data"
@@ -836,7 +844,7 @@
     <PreferenceCategory
         android:key="location_category"
         android:title="@string/location_category"
-        android:order="1300">
+        android:order="1400">
 
         <Preference android:key="mock_location_app"
                     android:title="@string/mock_location_app" />
@@ -857,7 +865,7 @@
     <PreferenceCategory
         android:key="input_method_category"
         android:title="@string/input_method_category"
-        android:order="1400">
+        android:order="1500">
 
         <SwitchPreferenceCompat
             android:key="stylus_handwriting"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 3a4e4e973b3..246359aa171 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -72,10 +72,16 @@ import com.android.settings.development.bluetooth.BluetoothHDAudioPreferenceCont
 import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController;
+import com.android.settings.development.desktopexperience.DesktopExperiencePreferenceController;
+import com.android.settings.development.desktopexperience.DesktopModePreferenceController;
+import com.android.settings.development.desktopexperience.DesktopModeSecondaryDisplayPreferenceController;
+import com.android.settings.development.desktopexperience.FreeformWindowsPreferenceController;
 import com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController;
 import com.android.settings.development.linuxterminal.LinuxTerminalPreferenceController;
 import com.android.settings.development.qstile.DevelopmentTiles;
 import com.android.settings.development.storage.SharedDataPreferenceController;
+import com.android.settings.development.window.NonResizableMultiWindowPreferenceController;
+import com.android.settings.development.window.ResizableActivityPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
 import com.android.settings.search.BaseSearchIndexProvider;
diff --git a/src/com/android/settings/development/DesktopExperiencePreferenceController.java b/src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceController.java
similarity index 94%
rename from src/com/android/settings/development/DesktopExperiencePreferenceController.java
rename to src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceController.java
index 28e92fcdac5..4075eaf77f6 100644
--- a/src/com/android/settings/development/DesktopExperiencePreferenceController.java
+++ b/src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_EXPERIENCE_FEATURES;
 import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
@@ -33,6 +33,9 @@ import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
+import com.android.settings.development.RebootConfirmationDialogHost;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
 
diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/desktopexperience/DesktopModePreferenceController.java
similarity index 93%
rename from src/com/android/settings/development/DesktopModePreferenceController.java
rename to src/com/android/settings/development/desktopexperience/DesktopModePreferenceController.java
index 4c6da1ee1cd..50691f60a7a 100644
--- a/src/com/android/settings/development/DesktopModePreferenceController.java
+++ b/src/com/android/settings/development/desktopexperience/DesktopModePreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
 import static android.window.DesktopModeFlags.ToggleOverride.fromSetting;
@@ -33,6 +33,9 @@ import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
+import com.android.settings.development.RebootConfirmationDialogHost;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
 
diff --git a/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java b/src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceController.java
similarity index 93%
rename from src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java
rename to src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceController.java
index 899b921e47f..d61d537c533 100644
--- a/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java
+++ b/src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
 
@@ -29,6 +29,9 @@ import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
+import com.android.settings.development.RebootConfirmationDialogHost;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
 
diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceController.java
similarity index 92%
rename from src/com/android/settings/development/FreeformWindowsPreferenceController.java
rename to src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceController.java
index 6cf1563bce5..60712408322 100644
--- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java
+++ b/src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
 
@@ -28,6 +28,9 @@ import androidx.preference.TwoStatePreference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
+import com.android.settings.development.RebootConfirmationDialogHost;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
 
diff --git a/src/com/android/settings/development/desktopexperience/OWNERS b/src/com/android/settings/development/desktopexperience/OWNERS
new file mode 100644
index 00000000000..6be8a6421d2
--- /dev/null
+++ b/src/com/android/settings/development/desktopexperience/OWNERS
@@ -0,0 +1,3 @@
+include platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/OWNERS
\ No newline at end of file
diff --git a/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java b/src/com/android/settings/development/window/NonResizableMultiWindowPreferenceController.java
similarity index 98%
rename from src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java
rename to src/com/android/settings/development/window/NonResizableMultiWindowPreferenceController.java
index 50d90bdb3e6..f2f2de5c88a 100644
--- a/src/com/android/settings/development/NonResizableMultiWindowPreferenceController.java
+++ b/src/com/android/settings/development/window/NonResizableMultiWindowPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.window;
 
 import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW;
 
diff --git a/src/com/android/settings/development/window/OWNERS b/src/com/android/settings/development/window/OWNERS
new file mode 100644
index 00000000000..c437f15567d
--- /dev/null
+++ b/src/com/android/settings/development/window/OWNERS
@@ -0,0 +1,2 @@
+include platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/OWNERS
\ No newline at end of file
diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/window/ResizableActivityPreferenceController.java
similarity index 94%
rename from src/com/android/settings/development/ResizableActivityPreferenceController.java
rename to src/com/android/settings/development/window/ResizableActivityPreferenceController.java
index 28b1478d49e..06b819eaa81 100644
--- a/src/com/android/settings/development/ResizableActivityPreferenceController.java
+++ b/src/com/android/settings/development/window/ResizableActivityPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.window;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -32,9 +32,9 @@ public class ResizableActivityPreferenceController extends DeveloperOptionsPrefe
     private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";
 
     @VisibleForTesting
-    final static int SETTING_VALUE_ON = 1;
+    static final int SETTING_VALUE_ON = 1;
     @VisibleForTesting
-    final static int SETTING_VALUE_OFF = 0;
+    static final int SETTING_VALUE_OFF = 0;
 
     public ResizableActivityPreferenceController(Context context) {
         super(context);
diff --git a/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceControllerTest.java
index 388e9b21f29..d661441a073 100644
--- a/tests/robotests/src/com/android/settings/development/DesktopExperiencePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopExperiencePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_EXPERIENCE_FEATURES;
 import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
@@ -44,6 +44,8 @@ import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
 import com.android.window.flags.Flags;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModePreferenceControllerTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModePreferenceControllerTest.java
index 9f718f9db62..ffbe31f0975 100644
--- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModePreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
 import static android.window.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
@@ -44,6 +44,8 @@ import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.internal.R;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
 import com.android.window.flags.Flags;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceControllerTest.java
similarity index 91%
rename from tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceControllerTest.java
index 2284d92cd70..3203b61609a 100644
--- a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/desktopexperience/DesktopModeSecondaryDisplayPreferenceControllerTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT;
 import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
 
-import static com.android.settings.development.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_OFF;
-import static com.android.settings.development.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_ON;
+import static com.android.settings.development.desktopexperience.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.desktopexperience.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -44,6 +44,8 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.R;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
 import com.android.window.flags.Flags;
 
 import org.junit.Before;
@@ -97,9 +99,9 @@ public class DesktopModeSecondaryDisplayPreferenceControllerTest {
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         mController.displayPreference(mScreen);
         when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(false);
-        when(mResources
-            .getBoolean(com.android.internal.R.bool.config_canInternalDisplayHostDesktops))
-            .thenReturn(false);
+        when(mResources.getBoolean(
+                com.android.internal.R.bool.config_canInternalDisplayHostDesktops)).thenReturn(
+                false);
     }
 
     @DisableFlags(Flags.FLAG_SHOW_DESKTOP_EXPERIENCE_DEV_OPTION)
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceControllerTest.java
index b4b0bccf832..aacb4b45719 100644
--- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/desktopexperience/FreeformWindowsPreferenceControllerTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.desktopexperience;
 
 import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
 
-import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF;
-import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
+import static com.android.settings.development.desktopexperience.FreeformWindowsPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.desktopexperience.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -43,6 +43,8 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.R;
+import com.android.settings.development.DevelopmentSettingsDashboardFragment;
+import com.android.settings.development.RebootConfirmationDialogFragment;
 import com.android.window.flags.Flags;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/development/desktopexperience/OWNERS b/tests/robotests/src/com/android/settings/development/desktopexperience/OWNERS
new file mode 100644
index 00000000000..c437f15567d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/desktopexperience/OWNERS
@@ -0,0 +1,2 @@
+include platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/OWNERS
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/NonResizableMultiWindowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/window/NonResizableMultiWindowPreferenceControllerTest.java
similarity index 93%
rename from tests/robotests/src/com/android/settings/development/NonResizableMultiWindowPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/window/NonResizableMultiWindowPreferenceControllerTest.java
index 7e7a258dd0d..7b8b8ae2698 100644
--- a/tests/robotests/src/com/android/settings/development/NonResizableMultiWindowPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/window/NonResizableMultiWindowPreferenceControllerTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.development.window;
 
 import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW;
 
-import static com.android.settings.development.NonResizableMultiWindowPreferenceController.SETTING_VALUE_OFF;
-import static com.android.settings.development.NonResizableMultiWindowPreferenceController.SETTING_VALUE_ON;
+import static com.android.settings.development.window.NonResizableMultiWindowPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.window.NonResizableMultiWindowPreferenceController.SETTING_VALUE_ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/development/window/OWNERS b/tests/robotests/src/com/android/settings/development/window/OWNERS
new file mode 100644
index 00000000000..6be8a6421d2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/window/OWNERS
@@ -0,0 +1,3 @@
+include platform/frameworks/base:/services/core/java/com/android/server/wm/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS
+include platform/frameworks/base:/libs/WindowManager/Shell/OWNERS
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/window/ResizableActivityPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/development/window/ResizableActivityPreferenceControllerTest.java
index 9a69a0a62dd..5c1f4294f48 100644
--- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/window/ResizableActivityPreferenceControllerTest.java
@@ -1,5 +1,3 @@
-package com.android.settings.development;
-
 /*
  * Copyright (C) 2017 The Android Open Source Project
  *
@@ -16,6 +14,8 @@ package com.android.settings.development;
  * limitations under the License.
  */
 
+package com.android.settings.development.window;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.verify;