From 9e38ebf366f52f7b29105705d9ea3a7ab74efe5b Mon Sep 17 00:00:00 2001 From: Calvin Pan Date: Mon, 17 Jan 2022 11:46:59 +0800 Subject: [PATCH] Clean in ZenModeConfig Bug: 199230228 Test: make Change-Id: I712f984b440043360b8f5fc6c6613c752bb2a2dd --- .../service/notification/ZenModeConfig.java | 32 +++++---- core/res/res/values/strings.xml | 72 ++++++++++--------- core/res/res/values/symbols.xml | 16 ++--- 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index c1d5a28aa349b..1556d25330805 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -46,6 +46,7 @@ import android.text.TextUtils; import android.text.format.DateFormat; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.PluralsMessageFormatter; import android.util.Slog; import android.util.TypedXmlPullParser; import android.util.TypedXmlSerializer; @@ -63,8 +64,10 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.TimeZone; import java.util.UUID; @@ -1333,25 +1336,30 @@ public class ZenModeConfig implements Parcelable { final CharSequence formattedTime = getFormattedTime(context, time, isToday(time), userHandle); final Resources res = context.getResources(); + final Map arguments = new HashMap<>(); if (minutes < 60) { // display as minutes num = minutes; - int summaryResId = shortVersion ? R.plurals.zen_mode_duration_minutes_summary_short - : R.plurals.zen_mode_duration_minutes_summary; - summary = res.getQuantityString(summaryResId, num, num, formattedTime); - int line1ResId = shortVersion ? R.plurals.zen_mode_duration_minutes_short - : R.plurals.zen_mode_duration_minutes; - line1 = res.getQuantityString(line1ResId, num, num, formattedTime); + int summaryResId = shortVersion ? R.string.zen_mode_duration_minutes_summary_short + : R.string.zen_mode_duration_minutes_summary; + arguments.put("count", num); + arguments.put("formattedTime", formattedTime); + summary = PluralsMessageFormatter.format(res, arguments, summaryResId); + int line1ResId = shortVersion ? R.string.zen_mode_duration_minutes_short + : R.string.zen_mode_duration_minutes; + line1 = PluralsMessageFormatter.format(res, arguments, line1ResId); line2 = res.getString(R.string.zen_mode_until, formattedTime); } else if (minutes < DAY_MINUTES) { // display as hours num = Math.round(minutes / 60f); - int summaryResId = shortVersion ? R.plurals.zen_mode_duration_hours_summary_short - : R.plurals.zen_mode_duration_hours_summary; - summary = res.getQuantityString(summaryResId, num, num, formattedTime); - int line1ResId = shortVersion ? R.plurals.zen_mode_duration_hours_short - : R.plurals.zen_mode_duration_hours; - line1 = res.getQuantityString(line1ResId, num, num, formattedTime); + int summaryResId = shortVersion ? R.string.zen_mode_duration_hours_summary_short + : R.string.zen_mode_duration_hours_summary; + arguments.put("count", num); + arguments.put("formattedTime", formattedTime); + summary = PluralsMessageFormatter.format(res, arguments, summaryResId); + int line1ResId = shortVersion ? R.string.zen_mode_duration_hours_short + : R.string.zen_mode_duration_hours; + line1 = PluralsMessageFormatter.format(res, arguments, line1ResId); line2 = res.getString(R.string.zen_mode_until, formattedTime); } else { // display as day/time diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2879759db5212..7eee6e3cddcb7 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5197,52 +5197,60 @@ Turn on - - For one minute (until %2$s) - For %1$d minutes (until %2$s) - + {count, plural, + =1 {For one minute (until {formattedTime})} + other {For # minutes (until {formattedTime})} + } + - - For 1 min (until %2$s) - For %1$d min (until %2$s) - + {count, plural, + =1 {For 1 min (until {formattedTime})} + other {For # min (until {formattedTime})} + } + - - For 1 hour (until %2$s) - For %1$d hours (until %2$s) - + {count, plural, + =1 {For 1 hour (until {formattedTime})} + other {For # hours (until {formattedTime})} + } + - - For 1 hr (until %2$s) - For %1$d hr (until %2$s) - + {count, plural, + =1 {For 1 hr (until {formattedTime})} + other {For # hr (until {formattedTime})} + } + - - For one minute - For %d minutes - + {count, plural, + =1 {For one minute} + other {For # minutes} + } + - - For 1 min - For %d min - + {count, plural, + =1 {For 1 min} + other {For # min} + } + - - For 1 hour - For %d hours - + {count, plural, + =1 {For 1 hour} + other {For # hours} + } + - - For 1 hr - For %d hr - + {count, plural, + =1 {For 1 hr} + other {For # hr} + } + Until %1$s diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a4b5d3caaabfd..9ec1810f7cb57 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2489,14 +2489,14 @@ - - - - - - - - + + + + + + + +