Merge changes from topic "q_dark_theme"

* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"

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));

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) {

src/com/android/settings/display/SystemUiThemePreferenceController.java

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import static android.provider.Settings.Secure.THEME_MODE;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.util.FeatureFlagUtils;
-
-import com.android.settings.core.BasePreferenceController;
-
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-/**
- * Setting where user can pick if SystemUI will be light, dark or try to match
- * the wallpaper colors.
- */
-public class SystemUiThemePreferenceController extends BasePreferenceController
-        implements Preference.OnPreferenceChangeListener {
-
-    private ListPreference mSystemUiThemePref;
-
-    public SystemUiThemePreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        boolean enabled = FeatureFlagUtils.isEnabled(mContext, "settings_systemui_theme");
-        return enabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mSystemUiThemePref = (ListPreference) screen.findPreference(getPreferenceKey());
-        int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
-        mSystemUiThemePref.setValue(Integer.toString(value));
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        int value = Integer.parseInt((String) newValue);
-        Settings.Secure.putInt(mContext.getContentResolver(), THEME_MODE, value);
-        refreshSummary(preference);
-        return true;
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        int value = Settings.Secure.getInt(mContext.getContentResolver(), THEME_MODE, 0);
-        int index = mSystemUiThemePref.findIndexOfValue(Integer.toString(value));
-        return mSystemUiThemePref.getEntries()[index];
-    }
-}