PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move NightMode to Display settings

Browse Source 
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DarkUIPreferenceController
Bug: 110758454
Change-Id: Ie389a0e55eb39f2b43d4e9c0739ad3f61469d740
This commit is contained in:
Lucas Dupin
2018-06-24 19:22:21 -07:00
parent c74969e7cc
commit a7ea18a6ce
5 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

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

45
src/com/android/settings/development/DarkUIPreferenceController.java → src/com/android/settings/display/DarkUIPreferenceController.java
View File

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