Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-24 02:01:17 +00:00
committed by Android (Google) Code Review
parent 3f5ab8bdf4 98cd691d8f
commit a5a9827328
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/values/strings.xml
View File

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

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

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