diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 05759167f31..3d5f198b3b3 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -108,13 +108,6 @@
             <intent android:action="com.android.settings.action.DEMO_MODE" />
         </Preference>
 
-        <ListPreference
-            android:key="dark_ui_mode"
-            android:title="@string/dark_ui_mode"
-            android:dialogTitle="@string/dark_ui_mode_title"
-            android:entries="@array/dark_ui_mode_entries"
-            android:entryValues="@array/dark_ui_mode_values" />
-
         <Preference
             android:key="quick_settings_tiles"
             android:title="@string/quick_settings_developer_tiles"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index fcc888c9e4c..bbb3a8145ca 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -108,15 +108,6 @@
         settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"
         settings:userRestriction="no_ambient_display" />
 
-    <!-- Hide night mode for now
-    <ListPreference
-        android:key="night_mode"
-        android:title="@string/night_mode_title"
-        settings:keywords="@string/keywords_display_night_mode"
-        android:summary="@string/night_mode_summary"
-        android:entries="@array/night_mode_entries"
-        android:entryValues="@array/night_mode_values" /> -->
-
     <SwitchPreference
         android:key="camera_gesture"
         android:title="@string/camera_gesture_title"
@@ -131,6 +122,14 @@
         android:title="@string/tap_to_wake"
         android:summary="@string/tap_to_wake_summary" />
 
+    <ListPreference
+        android:key="dark_ui_mode"
+        android:title="@string/dark_ui_mode"
+        android:dialogTitle="@string/dark_ui_mode_title"
+        android:entries="@array/dark_ui_mode_entries"
+        android:entryValues="@array/dark_ui_mode_values"
+        settings:controller="com.android.settings.display.DarkUIPreferenceController" />
+
     <ListPreference
         android:key="theme"
         android:title="@string/device_theme"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 361e94ad577..c97ed52ef40 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -386,7 +386,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new LocalBackupPasswordPreferenceController(context));
         controllers.add(new StayAwakePreferenceController(context, lifecycle));
         controllers.add(new HdcpCheckingPreferenceController(context));
-        controllers.add(new DarkUIPreferenceController(context));
         controllers.add(new BluetoothSnoopLogPreferenceController(context));
         controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
         controllers.add(new FileEncryptionPreferenceController(context));
diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
similarity index 67%
rename from src/com/android/settings/development/DarkUIPreferenceController.java
rename to src/com/android/settings/display/DarkUIPreferenceController.java
index 85f171b8a69..2476f98dc8a 100644
--- a/src/com/android/settings/development/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -14,56 +14,57 @@
  * limitations under the License
  */
 
-package com.android.settings.development;
+package com.android.settings.display;
 
 import android.app.UiModeManager;
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settings.core.BasePreferenceController;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
-public class DarkUIPreferenceController extends DeveloperOptionsPreferenceController
-        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+public class DarkUIPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
 
-    private static final String DARK_UI_KEY = "dark_ui_mode";
-    private final UiModeManager mUiModeManager;
+    private UiModeManager mUiModeManager;
 
-    public DarkUIPreferenceController(Context context) {
-        this(context, context.getSystemService(UiModeManager.class));
+    public DarkUIPreferenceController(Context context, String key) {
+        super(context, key);
+        mUiModeManager = context.getSystemService(UiModeManager.class);
     }
 
     @VisibleForTesting
-    DarkUIPreferenceController(Context context, UiModeManager uiModeManager) {
-        super(context);
+    void setUiModeManager(UiModeManager uiModeManager) {
         mUiModeManager = uiModeManager;
     }
 
     @Override
-    public String getPreferenceKey() {
-        return DARK_UI_KEY;
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        int value = mUiModeManager.getNightMode();
+        ListPreference preference = (ListPreference) screen.findPreference(getPreferenceKey());
+        preference.setValue(modeToString(value));
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         mUiModeManager.setNightMode(modeToInt((String) newValue));
-        updateSummary(preference);
+        refreshSummary(preference);
         return true;
     }
 
     @Override
-    public void updateState(Preference preference) {
-        updateSummary(preference);
-    }
-
-    private void updateSummary(Preference preference) {
-        int mode = mUiModeManager.getNightMode();
-        ((ListPreference) preference).setValue(modeToString(mode));
-        preference.setSummary(modeToDescription(mode));
+    public CharSequence getSummary() {
+        return modeToDescription(mUiModeManager.getNightMode());
     }
 
     private String modeToDescription(int mode) {
diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
index 3578beb4dd8..c5d6f18be64 100644
--- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.development;
+package com.android.settings.display;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
@@ -23,11 +23,13 @@ import static org.mockito.Mockito.when;
 import android.app.UiModeManager;
 import android.content.Context;
 
+import com.android.settings.display.DarkUIPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -51,7 +53,8 @@ public class DarkUIPreferenceControllerTest {
     public void setup() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new DarkUIPreferenceController(mContext, mUiModeManager);
+        mController = new DarkUIPreferenceController(mContext, "dark_ui_mode");
+        mController.setUiModeManager(mUiModeManager);
         when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
             .thenReturn(mPreference);
         mController.displayPreference(mPreferenceScreen);