From 194fc00787e7e9d278a657d5cef2306812596f81 Mon Sep 17 00:00:00 2001 From: kholoud mohamed Date: Tue, 26 Apr 2022 14:00:15 +0100 Subject: [PATCH] Add missing settings strings. Bug: 226183482 Test: manual Change-Id: I8efdff4531f31653ffb97c4aa485f49805c090b4 --- .../settings/language/LanguageAndInputSettings.java | 8 ++++++++ src/com/android/settings/password/ChooseLockGeneric.java | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 23e37ba8578..71b48f9b89f 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -16,6 +16,8 @@ package com.android.settings.language; +import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_DICTIONARY_FOR_WORK; +import static android.app.admin.DevicePolicyResources.Strings.Settings.SPELL_CHECKER_FOR_WORK; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_KEYBOARDS_AND_TOOLS; import android.app.Activity; @@ -80,6 +82,12 @@ public class LanguageAndInputSettings extends DashboardFragment { replaceEnterpriseStringTitle("language_and_input_for_work_category", WORK_PROFILE_KEYBOARDS_AND_TOOLS, R.string.language_and_input_for_work_category_title); + replaceEnterpriseStringTitle("spellcheckers_settings_for_work_pref", + SPELL_CHECKER_FOR_WORK, + R.string.spellcheckers_settings_for_work_title); + replaceEnterpriseStringTitle("user_dictionary_settings_for_work_pref", + PERSONAL_DICTIONARY_FOR_WORK, + R.string.user_dict_settings_for_work_title); } @Override diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index e340b505356..ac0c6d6ddba 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -23,6 +23,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_LOW; import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM; import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE; import static android.app.admin.DevicePolicyResources.Strings.Settings.LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE; +import static android.app.admin.DevicePolicyResources.Strings.Settings.LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK; import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE; @@ -346,7 +347,10 @@ public class ChooseLockGeneric extends SettingsActivity { // it's an update. updateExistingLock = mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId); if (updateExistingLock) { - getActivity().setTitle(R.string.lock_settings_picker_update_profile_lock_title); + getActivity().setTitle(mDpm.getResources().getString( + LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE, + () -> getString( + R.string.lock_settings_picker_update_profile_lock_title))); } else { getActivity().setTitle(mDpm.getResources().getString( LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE,