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

Merge "Add bedtime subtexts for night mode quick setting tile"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-21 12:21:13 +00:00
committed by Android (Google) Code Review
parent 4e5275f350 1cb5b92d26
commit 462c2564ea
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -670,6 +670,10 @@
<string name="quick_settings_dark_mode_secondary_label_on_at">On at <xliff:g id="time" example="10 pm">%s</xliff:g></string>
<!-- QuickSettings: Secondary text for when the Dark theme or some other tile will be on until some user-selected time. [CHAR LIMIT=20] -->
<string name="quick_settings_dark_mode_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>
<!-- QuickSettings: Secondary text for when the Dark theme will be enabled at bedtime. [CHAR LIMIT=40] -->
<string name="quick_settings_dark_mode_secondary_label_on_at_bedtime">On at bedtime</string>
<!-- QuickSettings: Secondary text for when the Dark theme or some other tile will be on until bedtime ends. [CHAR LIMIT=40] -->
<string name="quick_settings_dark_mode_secondary_label_until_bedtime_ends">Until bedtime ends</string>
<!-- QuickSettings: NFC tile [CHAR LIMIT=NONE] -->
<string name="quick_settings_nfc_label">NFC</string>

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

@@ -129,17 +129,27 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
? R.string.quick_settings_dark_mode_secondary_label_until_sunrise
: R.string.quick_settings_dark_mode_secondary_label_on_at_sunset);
} else if (uiMode == UiModeManager.MODE_NIGHT_CUSTOM) {
final boolean use24HourFormat = android.text.format.DateFormat.is24HourFormat(mContext);
final LocalTime time;
if (nightMode) {
time = mUiModeManager.getCustomNightModeEnd();
int nightModeCustomType = mUiModeManager.getNightModeCustomType();
if (nightModeCustomType == UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE) {
final boolean use24HourFormat = android.text.format.DateFormat.is24HourFormat(
mContext);
final LocalTime time;
if (nightMode) {
time = mUiModeManager.getCustomNightModeEnd();
} else {
time = mUiModeManager.getCustomNightModeStart();
}
state.secondaryLabel = mContext.getResources().getString(nightMode
? R.string.quick_settings_dark_mode_secondary_label_until
: R.string.quick_settings_dark_mode_secondary_label_on_at,
use24HourFormat ? time.toString() : formatter.format(time));
} else if (nightModeCustomType == UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME) {
state.secondaryLabel = mContext.getResources().getString(nightMode
? R.string.quick_settings_dark_mode_secondary_label_until_bedtime_ends
: R.string.quick_settings_dark_mode_secondary_label_on_at_bedtime);
} else {
time = mUiModeManager.getCustomNightModeStart();
state.secondaryLabel = null;
}
state.secondaryLabel = mContext.getResources().getString(nightMode
? R.string.quick_settings_dark_mode_secondary_label_until
: R.string.quick_settings_dark_mode_secondary_label_on_at,
use24HourFormat ? time.toString() : formatter.format(time));
} else {
state.secondaryLabel = null;
}