From 2d586f18f89051a69e9341c923d1096cb6735aa3 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 14 Jun 2019 12:56:59 -0700 Subject: [PATCH] Update string for work profile face unlock Fixes: 134053456 Test: With work profile and fully managed device, strings are correct Change-Id: I358b94acfa0626083fdc422b6333765dcc2bc158 --- res/values/strings.xml | 2 ++ .../face/FaceProfileStatusPreferenceController.java | 11 +++++++++++ .../settings/biometrics/face/FaceSettings.java | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5f47c8ce66a..76562534f68 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -888,6 +888,8 @@ Set up face unlock Face unlock + + Face unlock for work How to set up face unlock diff --git a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java index 196992dbd9d..18138d571dd 100644 --- a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java @@ -19,6 +19,10 @@ package com.android.settings.biometrics.face; 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 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC 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 9766f34cdad..2ec5f7a993d 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -119,6 +119,11 @@ public class FaceSettings extends DashboardFragment { 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);