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

107
src/com/android/settings/development/DarkUIPreferenceController.java
View File

@@ -1,107 +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.development;
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 androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
public class DarkUIPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String DARK_UI_KEY = "dark_ui_mode";
private final UiModeManager mUiModeManager;
public DarkUIPreferenceController(Context context) {
this(context, context.getSystemService(UiModeManager.class));
}
@VisibleForTesting
DarkUIPreferenceController(Context context, UiModeManager uiModeManager) {
super(context);
mUiModeManager = uiModeManager;
}
@Override
public String getPreferenceKey() {
return DARK_UI_KEY;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mUiModeManager.setNightMode(modeToInt((String) newValue));
updateSummary(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));
}
private String modeToDescription(int mode) {
String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return values[0];
case UiModeManager.MODE_NIGHT_YES:
return values[1];
case UiModeManager.MODE_NIGHT_NO:
default:
return values[2];
}
}
private String modeToString(int mode) {
switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return "auto";
case UiModeManager.MODE_NIGHT_YES:
return "yes";
case UiModeManager.MODE_NIGHT_NO:
default:
return "no";
}
}
private int modeToInt(String mode) {
switch (mode) {
case "auto":
return UiModeManager.MODE_NIGHT_AUTO;
case "yes":
return UiModeManager.MODE_NIGHT_YES;
case "no":
default:
return UiModeManager.MODE_NIGHT_NO;
}
}
}

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