Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1916172 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Night mode wording 

Renaming to 'theme' per UX recomendation

Change-Id: I80817ea3778715c3514205ede738f70d92fa15e9
Fixes: 123042258
Test: manual
parent 7c7e0d4d

res/values/arrays.xml

+2 −4
Original line number Diff line number Diff line
@@ -1127,14 +1127,12 @@ 


    <!-- Titles for ui dark mode preference. -->

    <string-array name="dark_ui_mode_entries" >

        <item>Automatic (based on time of day)</item>

        <item>Always on</item>

        <item>Always off</item>

        <item>Dark</item>

        <item>Light</item>

    </string-array>



    <!-- Values for ui dark mode preference. -->

    <string-array name="dark_ui_mode_values" translatable="false" >

        <item>auto</item>

        <item>yes</item>

        <item>no</item>

    </string-array>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -9597,10 +9597,10 @@ 
    <string name="demo_mode">System UI demo mode</string>









    <!-- [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 -->









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









    <string name="quick_settings_developer_tiles">Quick settings developer tiles</string>

























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



+6
−9






























Original line number
Diff line number
Diff line







@@ -51,7 +51,7 @@ public class DarkUIPreferenceController extends BasePreferenceController







    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        int value = mUiModeManager.getNightMode();









        ListPreference preference = (ListPreference) screen.findPreference(getPreferenceKey());









        ListPreference preference = screen.findPreference(getPreferenceKey());









        preference.setValue(modeToString(value));









    }


















@@ -70,24 +70,22 @@ public class DarkUIPreferenceController extends BasePreferenceController







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









                return values[0];









            case UiModeManager.MODE_NIGHT_NO:









            case UiModeManager.MODE_NIGHT_AUTO:









            default:









                return values[2];









                return values[1];



















        }









    }



















    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:









            case UiModeManager.MODE_NIGHT_AUTO:









            default:









                return "no";


















@@ -96,11 +94,10 @@ public class DarkUIPreferenceController extends BasePreferenceController

















    private int modeToInt(String mode) {









        switch (mode) {









            case "auto":









                return UiModeManager.MODE_NIGHT_AUTO;









            case "yes":









                return UiModeManager.MODE_NIGHT_YES;









            case "no":









            case "auto":









            default:









                return UiModeManager.MODE_NIGHT_NO;









        }
































tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -59,8 +59,9 @@ public class DarkUIPreferenceControllerTest {

















    @Test









    public void onPreferenceChanged_setAuto() {









        // Auto was deprecated, it should default to NO.









        mController.onPreferenceChange(mPreference, "auto");









        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_AUTO));









        verify(mUiModeManager).setNightMode(eq(UiModeManager.MODE_NIGHT_NO));









    }



















    @Test