From c18bb1a0cdf5f805f202db13908374b4bcbf2dc7 Mon Sep 17 00:00:00 2001 From: Roman Kalukiewicz Date: Fri, 19 Aug 2022 17:01:01 -0700 Subject: [PATCH] Change the "Blocked by IT admin" to use family related dialog for children. Test: manual Change-Id: Ic610d0d0247346c97a80a794916284969022defc --- res/values/strings.xml | 2 ++ .../settings/enterprise/DeviceAdminStringProviderImpl.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5f8fd663a40..47a61695a9d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10874,6 +10874,8 @@ Parent needed Hand the phone to your parent to start setting this up + + Hand the phone to your parent to allow this setting to be changed. If you have questions, contact your IT admin diff --git a/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java b/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java index 422ffe9a4c6..9d9f015cd31 100644 --- a/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java +++ b/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java @@ -95,6 +95,11 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider { return mContext.getString(R.string.disabled_by_policy_title_biometric_parental_consent); } + @Override + public String getDisabledByParentContent() { + return mContext.getString(R.string.disabled_by_policy_parental_consent); + } + @Override public String getDisabledBiometricsParentConsentContent() { return mContext.getString(R.string.disabled_by_policy_content_biometric_parental_consent);