Merge "Modes List: Show the dynamic description, if available" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
5f60b880ea
@@ -74,15 +74,16 @@ class ZenModesListItemPreference extends RestrictedPreference {
|
||||
}
|
||||
|
||||
setTitle(mZenMode.getName());
|
||||
String dynamicDescription = zenMode.getDynamicDescription(mContext);
|
||||
CharSequence statusText = switch (mZenMode.getStatus()) {
|
||||
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_format_status_and_trigger,
|
||||
mContext.getString(R.string.zen_mode_active_text),
|
||||
mZenMode.getRule().getTriggerDescription());
|
||||
case ENABLED -> mZenMode.getRule().getTriggerDescription();
|
||||
dynamicDescription);
|
||||
case ENABLED -> dynamicDescription;
|
||||
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);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user