diff options
author | 2024-01-09 15:44:37 +0000 | |
---|---|---|
committer | 2024-01-09 15:44:37 +0000 | |
commit | 7ad03b8f7d8c4329e32add347e00d2180d54190e (patch) | |
tree | f4ff046d5ac8e7fc783f5ce879bcfdeb5f02a723 | |
parent | 7b5fe708eaf3f5c2c2ed5adfc421e5d48ecdde12 (diff) | |
parent | 9c133e73737875e53101280f861f2e70c93e2d81 (diff) |
Fix non-formatted ICU plurals strings in summary. am: 9c133e7373
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/25831282
Change-Id: I13be4a79c5a7945782fd96ca4e07a3f8e4906dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | service/java/com/android/safetycenter/SafetyCenterDataFactory.java | 5 | ||||
-rw-r--r-- | tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java index fe4a1ee43..e7edc1831 100644 --- a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java +++ b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java @@ -1178,11 +1178,10 @@ public final class SafetyCenterDataFactory { return mSafetyCenterResourcesContext.getStringByName( "overall_severity_level_ok_summary"); } else if (isTip(topNonDismissedIssue.getSafetySourceIssue())) { - return mSafetyCenterResourcesContext.getStringByName( - "overall_severity_level_tip_summary", numTipIssues); + return getIcuPluralsString("overall_severity_level_tip_summary", numTipIssues); } else if (isAutomatic(topNonDismissedIssue.getSafetySourceIssue())) { - return mSafetyCenterResourcesContext.getStringByName( + return getIcuPluralsString( "overall_severity_level_action_taken_summary", numAutomaticIssues); } // Fall through. diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt index 5ff42e23c..a6fbb89b9 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt @@ -118,10 +118,7 @@ class SafetyCenterTestData(context: Context) { ): SafetyCenterStatus = SafetyCenterStatus.Builder( safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_title"), - safetyCenterResourcesContext.getStringByName( - "overall_severity_level_tip_summary", - numTipIssues - ) + getIcuPluralsString("overall_severity_level_tip_summary", numTipIssues) ) .setSeverityLevel(OVERALL_SEVERITY_LEVEL_OK) .build() @@ -135,7 +132,7 @@ class SafetyCenterTestData(context: Context) { ): SafetyCenterStatus = SafetyCenterStatus.Builder( safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_title"), - safetyCenterResourcesContext.getStringByName( + getIcuPluralsString( "overall_severity_level_action_taken_summary", numAutomaticIssues ) |