From 56519258efbf3af45efcf2449b4cc1d230ab6183 Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Tue, 30 Mar 2021 17:31:53 +0100 Subject: [PATCH] Remove hardcoded URL string * Details on URLs in the credential management app preference should be translatable. * Remove hardcoded text and introduce strings. Manual testing * Download TestDPC and select 'Request to manage credentials'. * Select allow. * Go to Settings Credential management app preference and verify URL strings are displayed correctly. Bug: 170627997 Test: manual testing Change-Id: Iadff0c136064dabc3f77e30b46356126d657397f --- res/values/strings.xml | 5 +++++ .../settings/security/CredentialManagementAppAdapter.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2e98ec57de3..cae6cda0bb2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6522,6 +6522,11 @@ Certificates installed by this app identify you to the apps and URLs below Remove + + + %d URL + %d URLs + Emergency dialing signal diff --git a/src/com/android/settings/security/CredentialManagementAppAdapter.java b/src/com/android/settings/security/CredentialManagementAppAdapter.java index e56fc63c443..ca3ecc49a31 100644 --- a/src/com/android/settings/security/CredentialManagementAppAdapter.java +++ b/src/com/android/settings/security/CredentialManagementAppAdapter.java @@ -179,8 +179,8 @@ public class CredentialManagementAppAdapter extends RecyclerView.Adapter urisToAliases) { - String url = urisToAliases.size() > 1 ? " URLs" : " URL"; - return urisToAliases.size() + url; + return mContext.getResources().getQuantityString(R.plurals.number_of_urls, + urisToAliases.size(), urisToAliases.size()); } }