From 304c68a836aa4859e71dbd1984531790bde65a13 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Mon, 12 Apr 2021 16:28:03 +0800 Subject: [PATCH] Fix gender issue on subtext of screen pinning Create a new string id so that localization team can fix it individually. Test: Rebuilt rom and see correct subtext Fix: 184748174 Change-Id: I3ab644950ee8211c89199446b92e759a5efa4527 --- res/values/strings.xml | 5 +++++ .../settings/security/ScreenPinningPreferenceController.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2688b320335..fefcd227baf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9769,6 +9769,11 @@ On Off + + + On + + Off App pinning diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java index 37a3f9caaaf..442380d4925 100644 --- a/src/com/android/settings/security/ScreenPinningPreferenceController.java +++ b/src/com/android/settings/security/ScreenPinningPreferenceController.java @@ -40,7 +40,7 @@ public class ScreenPinningPreferenceController extends BasePreferenceController public CharSequence getSummary() { return Settings.System.getInt(mContext.getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED, 0) != 0 - ? mContext.getText(R.string.switch_on_text) - : mContext.getText(R.string.switch_off_text); + ? mContext.getText(R.string.screen_pinning_switch_on_text) + : mContext.getText(R.string.screen_pinning_switch_off_text); } }