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

Merge "Night mode wording"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-21 00:16:48 +00:00
committed by Android (Google) Code Review
parent bb24f21bee a1916172d8
commit ad867a1ba3
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/arrays.xml
View File

@@ -1127,14 +1127,12 @@
<!-- Titles for ui dark mode preference. --> <!-- Titles for ui dark mode preference. -->
<string-array name="dark_ui_mode_entries" > <string-array name="dark_ui_mode_entries" >
<item>Automatic (based on time of day)</item> <item>Dark</item>
<item>Always on</item> <item>Light</item>
<item>Always off</item>
</string-array> </string-array>
<!-- Values for ui dark mode preference. --> <!-- Values for ui dark mode preference. -->
<string-array name="dark_ui_mode_values" translatable="false" > <string-array name="dark_ui_mode_values" translatable="false" >
<item>auto</item>
<item>yes</item> <item>yes</item>
<item>no</item> <item>no</item>
</string-array> </string-array>

4
res/values/strings.xml
View File

@@ -9599,10 +9599,10 @@
<string name="demo_mode">System UI demo mode</string> <string name="demo_mode">System UI demo mode</string>
<!-- [CHAR LIMIT=60] Name of setting that changes the UI to dark --> <!-- [CHAR LIMIT=60] Name of setting that changes the UI to dark -->
<string name="dark_ui_mode">Dark mode</string> <string name="dark_ui_mode">Theme</string>
<!-- [CHAR LIMIT=60] Name of dev option that changes the color of the UI --> <!-- [CHAR LIMIT=60] Name of dev option that changes the color of the UI -->
<string name="dark_ui_mode_title">Set Dark mode</string> <string name="dark_ui_mode_title">Set Theme</string>
<!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles --> <!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles -->
<string name="quick_settings_developer_tiles">Quick settings developer tiles</string> <string name="quick_settings_developer_tiles">Quick settings developer tiles</string>

15
src/com/android/settings/display/DarkUIPreferenceController.java
View File

@@ -51,7 +51,7 @@ public class DarkUIPreferenceController extends BasePreferenceController
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
int value = mUiModeManager.getNightMode(); int value = mUiModeManager.getNightMode();
ListPreference preference = (ListPreference) screen.findPreference(getPreferenceKey()); ListPreference preference = screen.findPreference(getPreferenceKey());
preference.setValue(modeToString(value)); preference.setValue(modeToString(value));
} }
@@ -70,24 +70,22 @@ public class DarkUIPreferenceController extends BasePreferenceController
private String modeToDescription(int mode) { private String modeToDescription(int mode) {
String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries); String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
switch (mode) { switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return values[0];
case UiModeManager.MODE_NIGHT_YES: case UiModeManager.MODE_NIGHT_YES:
return values[1]; return values[0];
case UiModeManager.MODE_NIGHT_NO: case UiModeManager.MODE_NIGHT_NO:
case UiModeManager.MODE_NIGHT_AUTO:
default: default:
return values[2]; return values[1];
} }
} }
private String modeToString(int mode) { private String modeToString(int mode) {
switch (mode) { switch (mode) {
case UiModeManager.MODE_NIGHT_AUTO:
return "auto";
case UiModeManager.MODE_NIGHT_YES: case UiModeManager.MODE_NIGHT_YES:
return "yes"; return "yes";
case UiModeManager.MODE_NIGHT_NO: case UiModeManager.MODE_NIGHT_NO:
case UiModeManager.MODE_NIGHT_AUTO:
default: default:
return "no"; return "no";
@@ -96,11 +94,10 @@ public class DarkUIPreferenceController extends BasePreferenceController
private int modeToInt(String mode) { private int modeToInt(String mode) {
switch (mode) { switch (mode) {
case "auto":
return UiModeManager.MODE_NIGHT_AUTO;
case "yes": case "yes":
return UiModeManager.MODE_NIGHT_YES; return UiModeManager.MODE_NIGHT_YES;
case "no": case "no":
case "auto":
default: default:
return UiModeManager.MODE_NIGHT_NO; return UiModeManager.MODE_NIGHT_NO;
} }

3
tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
View File

@@ -59,8 +59,9 @@ public class DarkUIPreferenceControllerTest {
@Test @Test
public void onPreferenceChanged_setAuto() { public void onPreferenceChanged_setAuto() {
// Auto was deprecated, it should default to NO.
mController.onPreferenceChange(mPreference, "auto"); mController.onPreferenceChange(mPreference, "auto");
verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_AUTO)); verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_NO));
} }
@Test @Test