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

Commit a5a98273 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[QS] Update string name in prep for freeze" into pi-dev

parents 3f5ab8bd 98cd691d

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -815,8 +815,8 @@ 
    <string name="quick_settings_night_secondary_label_until_sunrise">Until sunrise</string>

    <!-- QuickSettings: Secondary text for when the Night Light will be enabled at some user-selected time. [CHAR LIMIT=20] -->

    <string name="quick_settings_night_secondary_label_on_at">On at <xliff:g id="time" example="10 pm">%s</xliff:g></string>

    <!-- QuickSettings: Secondary text for when the Night Light will be on until some user-selected time. [CHAR LIMIT=20] -->

    <string name="quick_settings_night_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>

    <!-- QuickSettings: Secondary text for when the Night Light or some other tile will be on until some user-selected time. [CHAR LIMIT=20] -->

    <string name="quick_settings_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>



    <!-- QuickSettings: NFC tile [CHAR LIMIT=NONE] -->

    <string name="quick_settings_nfc_label">NFC</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> 


                if (isNightLightActivated) {

                    toggleTime = mController.getCustomEndTime();

                    toggleTimeStringRes = R.string.quick_settings_night_secondary_label_until;

                    toggleTimeStringRes = R.string.quick_settings_secondary_label_until;

                } else {

                    toggleTime = mController.getCustomStartTime();

                    toggleTimeStringRes = R.string.quick_settings_night_secondary_label_on_at;