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

Commit 39ca0215 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Add face profile settings 

Fixes: 110907543

Test: Builds

Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
parent 44427259

res/xml/security_dashboard_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ 
            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder" />



        <Preference

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

            android:summary="@string/summary_placeholder" />



    </PreferenceCategory>



    <PreferenceCategory

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.settings.biometrics.face;



import android.content.Context;

import android.os.UserHandle;



public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {



    public static final String KEY_FACE_SETTINGS = "face_settings_profile";



    public FaceProfileStatusPreferenceController(Context context) {

        super(context, KEY_FACE_SETTINGS);

    }



    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

    }



    @Override

    protected int getUserId() {

        return mProfileChallengeUserId;

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ public class FaceSettings extends DashboardFragment { 
        super.onActivityResult(requestCode, resultCode, data);

        if (requestCode == CONFIRM_REQUEST) {

            if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {

                mFaceManager.setActiveUser(mUserId);

                // The pin/pattern/password was set.

                if (data != null) {

                    mToken = data.getByteArrayExtra(

src/com/android/settings/security/SecuritySettings.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.provider.SearchIndexableResource;



import com.android.settings.R;

import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;

import com.android.settings.biometrics.face.FaceStatusPreferenceController;

import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;

import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
@@ -125,6 +126,7 @@ public class SecuritySettings extends DashboardFragment { 
        profileSecurityControllers.add(new LockUnificationPreferenceController(context, host));

        profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(

                context, lifecycle));

        profileSecurityControllers.add(new FaceProfileStatusPreferenceController(context));

        profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context));

        controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)

                .setChildren(profileSecurityControllers));