PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modes List: Show the dynamic description, if available" into main

Browse Source
This commit is contained in:
Matías Hernández
2024-08-07 20:36:29 +00:00
committed by Android (Google) Code Review
parent 494dc4c282 a53b35262d
commit 5f60b880ea
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/notification/modes/ZenModesListItemPreference.java
View File

@@ -74,15 +74,16 @@ class ZenModesListItemPreference extends RestrictedPreference {
} }
setTitle(mZenMode.getName()); setTitle(mZenMode.getName());
String dynamicDescription = zenMode.getDynamicDescription(mContext);
CharSequence statusText = switch (mZenMode.getStatus()) { CharSequence statusText = switch (mZenMode.getStatus()) {
case ENABLED_AND_ACTIVE -> case ENABLED_AND_ACTIVE ->
Strings.isNullOrEmpty(mZenMode.getTriggerDescription()) Strings.isNullOrEmpty(dynamicDescription)
? mContext.getString(R.string.zen_mode_active_text) ? mContext.getString(R.string.zen_mode_active_text)
: mContext.getString( : mContext.getString(
R.string.zen_mode_format_status_and_trigger, R.string.zen_mode_format_status_and_trigger,
mContext.getString(R.string.zen_mode_active_text), mContext.getString(R.string.zen_mode_active_text),
mZenMode.getRule().getTriggerDescription()); dynamicDescription);
case ENABLED -> mZenMode.getRule().getTriggerDescription(); case ENABLED -> dynamicDescription;
case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user); case DISABLED_BY_USER -> mContext.getString(R.string.zen_mode_disabled_by_user);
case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_needs_setup); case DISABLED_BY_OTHER -> mContext.getString(R.string.zen_mode_disabled_needs_setup);
}; };