Merge "Change the "Blocked by IT admin" to use family related dialog for children."

res/values/strings.xml

@@ -9306,6 +9306,8 @@
     <string name="disabled_by_policy_title_biometric_parental_consent">Parent needed</string>
     <!-- Dialog content shown when parental consent is required for the child to set up biometric authentication. [CHAR LIMIT=NONE] -->
     <string name="disabled_by_policy_content_biometric_parental_consent">Hand the phone to your parent to start setting this up</string>
+    <!-- Dialog content shown when parental consent is required for the child to change blocked settings. [CHAR LIMIT=NONE] -->
+    <string name="disabled_by_policy_parental_consent">Hand the phone to your parent to allow this setting to be changed.</string>
     <!-- Shown when the user tries to change phone settings that are blocked by their IT admin [CHAR LIMIT=200] -->
     <string name="default_admin_support_msg">For more info, contact your IT admin</string>
     <!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->

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);