Merge "Update string for work profile face unlock" into qt-r1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 937d9c1..e077ff8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -888,6 +888,8 @@
<string name="security_settings_face_preference_summary_none">Set up face unlock</string>
<!-- Title shown for menu item that launches face settings or enrollment. [CHAR LIMIT=32] -->
<string name="security_settings_face_preference_title">Face unlock</string>
+ <!-- Title shown for menu item that launches face settings or enrollment, for work profile [CHAR LIMIT=50] -->
+ <string name="security_settings_face_profile_preference_title">Face unlock for work</string>
<!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->
<string name="security_settings_face_enroll_education_title">How to set up face unlock</string>
<!-- Introduction title shown in face enrollment education screen for accessibility [CHAR LIMI=40]-->
diff --git a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
index 196992d..18138d5 100644
--- a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java
@@ -19,6 +19,10 @@
import android.content.Context;
import android.os.UserHandle;
+import com.android.settings.R;
+
+import androidx.preference.Preference;
+
public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {
public static final String KEY_FACE_SETTINGS = "face_settings_profile";
@@ -37,4 +41,11 @@
protected int getUserId() {
return mProfileChallengeUserId;
}
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ preference.setTitle(mContext.getResources().getString(
+ R.string.security_settings_face_profile_preference_title));
+ }
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 39d69b0..b33c104 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -119,6 +119,11 @@
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
+ if (mUserManager.getUserInfo(mUserId).isManagedProfile()) {
+ getActivity().setTitle(getActivity().getResources().getString(
+ R.string.security_settings_face_profile_preference_title));
+ }
+
Preference keyguardPref = findPreference(FaceSettingsKeyguardPreferenceController.KEY);
Preference appPref = findPreference(FaceSettingsAppPreferenceController.KEY);
Preference attentionPref = findPreference(FaceSettingsAttentionPreferenceController.KEY);