Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7411c8df authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Update title in Face and Fingerprint settings for private space" into main

parents a28e8089 8f309778

src/com/android/settings/biometrics/face/FaceSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -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)

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -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);

    }