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

Update summary of Modes entry in Settings

Browse Source 
Instead of the number of automatic modes, simply list the first (up to 3) existing modes, according to the standard sort order, when none are active.

As a consequence, the summary is never empty now.

Fixes: 374179941
Test: atest ZenModeSummaryHelperTest + manual
Flag: android.app.modes_ui
Change-Id: I04f9d90a5e1e4ed13d66181b85d77fef8c6ff256
This commit is contained in:
Matías Hernández
2024-10-24 16:16:00 +02:00
parent 4e8d11bb40
commit a9e8225ba4
3 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
View File

@@ -498,29 +498,27 @@ class ZenModeSummaryHelper {
MessageFormat msgFormat = new MessageFormat(
mContext.getString(R.string.zen_modes_summary_some_active),
Locale.getDefault());
Map<String, Object> args = new HashMap<>();
args.put("count", activeModes.size());
args.put("mode_1", activeModes.get(0).getName());
if (activeModes.size() >= 2) {
args.put("mode_2", activeModes.get(1).getName());
if (activeModes.size() == 3) {
args.put("mode_3", activeModes.get(2).getName());
}
}
return msgFormat.format(args);
return buildModesSummary(msgFormat, activeModes);
} else {
int automaticModeCount = (int) modes.stream()
.filter(m -> m.isEnabled() && !m.isManualDnd() && !m.isCustomManual())
.count();
MessageFormat msgFormat = new MessageFormat(
mContext.getString(R.string.zen_modes_summary_none_active),
mContext.getString(R.string.zen_modes_summary),
Locale.getDefault());
Map<String, Object> msgArgs = Map.of("count", automaticModeCount);
return msgFormat.format(msgArgs);
return buildModesSummary(msgFormat, modes);
}
}
private static String buildModesSummary(MessageFormat msgFormat, List<ZenMode> modes) {
Map<String, Object> args = new HashMap<>();
args.put("count", modes.size());
if (modes.size() >= 1) {
args.put("mode_1", modes.get(0).getName());
if (modes.size() >= 2) {
args.put("mode_2", modes.get(1).getName());
if (modes.size() >= 3) {
args.put("mode_3", modes.get(2).getName());
}
}
}
return msgFormat.format(args);
}
}