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

Commit f19ce4af authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Dark theme battery saver tile secondary text 

Dark theme tile on battery saver should show
"Dark theme" and "Battery saver" on two lines

Test: manual. turn battery saver on while dark theme on auto

Fixes: 146439388
Change-Id: I460b582ca7fcf244b406d6eaf70c10e4edc52d85
parent 0454ccde

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -892,8 +892,8 @@ 
    <string name="quick_settings_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>

    <!-- QuickSettings: Label for the toggle to activate dark theme (A.K.A Dark Mode). [CHAR LIMIT=20] -->

    <string name="quick_settings_ui_mode_night_label">Dark theme</string>

    <!-- QuickSettings: Label for the dark theme tile when enabled by battery saver. [CHAR LIMIT=40] -->

    <string name="quick_settings_ui_mode_night_label_battery_saver">Dark theme\nBattery saver</string>

    <!-- QuickSettings: Secondary text for the dark theme tile when enabled by battery saver. [CHAR LIMIT=20] -->

    <string name="quick_settings_dark_mode_secondary_label_battery_saver">Battery saver</string>

    <!-- QuickSettings: Secondary text for when the Dark Mode will be enabled at sunset. [CHAR LIMIT=20] -->

    <string name="quick_settings_dark_mode_secondary_label_on_at_sunset">On at sunset</string>

    <!-- QuickSettings: Secondary text for when the Dark Mode will be on until sunrise. [CHAR LIMIT=20] -->

packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java

+5 −4
Original line number Diff line number Diff line
@@ -91,7 +91,10 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements 
        boolean nightMode = (mContext.getResources().getConfiguration().uiMode

                        & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;



        if (isAuto && !powerSave) {

        if (powerSave) {

            state.secondaryLabel = mContext.getResources().getString(

                    R.string.quick_settings_dark_mode_secondary_label_battery_saver);

        } else if (isAuto) {

            state.secondaryLabel = mContext.getResources().getString(nightMode

                    ? R.string.quick_settings_dark_mode_secondary_label_until_sunrise

                    : R.string.quick_settings_dark_mode_secondary_label_on_at_sunset);
@@ -99,9 +102,7 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements 
            state.secondaryLabel = null;

        }

        state.value = nightMode;

        state.label = mContext.getString(powerSave

                ? R.string.quick_settings_ui_mode_night_label_battery_saver

                : R.string.quick_settings_ui_mode_night_label);

        state.label = mContext.getString(R.string.quick_settings_ui_mode_night_label);

        state.icon = mIcon;

        state.contentDescription = TextUtils.isEmpty(state.secondaryLabel)

                ? state.label