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

Merge "Remove night mode from developer settings" into nyc-dev

Browse Source
This commit is contained in:
Alan Viverette
2016-02-22 20:43:59 +00:00
committed by Android (Google) Code Review
parent 7893931a50 686f984384
commit f4ace6fe91
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@@ -5710,7 +5710,6 @@
<string name="keywords_display">screen, touchscreen</string>
<string name="keywords_display_brightness_level">dim screen, touchscreen, battery</string>
<string name="keywords_display_auto_brightness">dim screen, touchscreen, battery</string>
<string name="keywords_display_night_mode">dark theme, night mode, dim screen, invert brightness</string>
<string name="keywords_display_wallpaper">background, personalize, customize display</string>
<string name="keywords_display_font_size">text size</string>
<string name="keywords_display_cast_screen">project, cast</string>

7
res/xml/development_prefs.xml
View File

@@ -60,13 +60,6 @@
android:summary="@string/runningservices_settings_summary"
android:fragment="com.android.settings.applications.RunningServices" />
<DropDownPreference
android:key="night_mode"
android:title="@string/night_mode_title"
android:summary="%s"
android:entries="@array/night_mode_entries"
android:entryValues="@array/night_mode_values" />
<PreferenceScreen
android:key="convert_to_file_encryption"
android:title="@string/convert_to_file_encryption"

24
src/com/android/settings/DevelopmentSettings.java
View File

@@ -202,7 +202,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
private static final String KEY_NIGHT_MODE = "night_mode";
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
private static final String OTA_DISABLE_AUTOMATIC_UPDATE_KEY = "ota_disable_automatic_update";
@@ -292,8 +291,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mShowAllANRs;
private DropDownPreference mNightModePreference;
private ColorModePreference mColorModePreference;
private SwitchPreference mForceResizable;
@@ -479,27 +476,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mOtaDisableAutomaticUpdate = findAndInitSwitchPref(OTA_DISABLE_AUTOMATIC_UPDATE_KEY);
mNightModePreference = (DropDownPreference) findPreference(KEY_NIGHT_MODE);
final UiModeManager uiManager = (UiModeManager) getSystemService(
Context.UI_MODE_SERVICE);
final int currentNightMode = uiManager.getNightMode();
mNightModePreference.setValue(String.valueOf(currentNightMode));
mNightModePreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
try {
final int value = Integer.parseInt((String) newValue);
final UiModeManager uiManager = (UiModeManager) getSystemService(
Context.UI_MODE_SERVICE);
uiManager.setNightMode(value);
return true;
} catch (NumberFormatException e) {
Log.e(TAG, "could not persist night mode setting", e);
return false;
}
}
});
mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);
mColorModePreference.updateCurrentAndSupported();
if (mColorModePreference.getTransformsCount() < 2) {