From 8f30977859bbe32a910db80e80f191ce6e2af177 Mon Sep 17 00:00:00 2001 From: josephpv Date: Fri, 31 May 2024 01:49:44 +0000 Subject: [PATCH] Update title in Face and Fingerprint settings for private space Screenshots: b/335748976#comment9 Bug: 335748976 Test: Manual Change-Id: I3d99488f33177d4ac4aa2e4bb3c420604460ac72 --- src/com/android/settings/biometrics/face/FaceSettings.java | 5 +++++ .../biometrics/fingerprint/FingerprintSettings.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java index 061487aa5f1..8884ce36253 100644 --- a/src/com/android/settings/biometrics/face/FaceSettings.java +++ b/src/com/android/settings/biometrics/face/FaceSettings.java @@ -19,6 +19,7 @@ package com.android.settings.biometrics.face; import static android.app.Activity.RESULT_OK; import static android.app.admin.DevicePolicyResources.Strings.Settings.FACE_SETTINGS_FOR_WORK_TITLE; +import static com.android.settings.Utils.isPrivateProfile; import static com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST; import static com.android.settings.biometrics.BiometricEnrollBase.ENROLL_REQUEST; import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED; @@ -172,6 +173,10 @@ public class FaceSettings extends DashboardFragment { mDevicePolicyManager.getResources().getString(FACE_SETTINGS_FOR_WORK_TITLE, () -> getActivity().getResources().getString( R.string.security_settings_face_profile_preference_title))); + } else if (isPrivateProfile(mUserId, getContext())) { + getActivity().setTitle( + getActivity().getResources().getString( + R.string.private_space_face_unlock_title)); } mLockscreenController = Utils.isMultipleBiometricsSupported(context) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 76511769ecf..db87c0facac 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -22,6 +22,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF import static android.app.admin.DevicePolicyResources.UNDEFINED; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; +import static com.android.settings.Utils.isPrivateProfile; import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY; import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_KEY_CHALLENGE; @@ -127,7 +128,10 @@ public class FingerprintSettings extends SubSettings { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - CharSequence msg = getText(R.string.security_settings_fingerprint_preference_title); + final int userId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); + CharSequence msg = getText(isPrivateProfile(userId, this) + ? R.string.private_space_fingerprint_unlock_title + : R.string.security_settings_fingerprint_preference_title); setTitle(msg); }