Add face profile settings
Fixes: 110907543 Test: Builds Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
This commit is contained in:
@@ -87,6 +87,11 @@
|
|||||||
android:title="@string/security_settings_fingerprint_preference_title"
|
android:title="@string/security_settings_fingerprint_preference_title"
|
||||||
android:summary="@string/summary_placeholder" />
|
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>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
@@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
|
}
|
@@ -128,6 +128,7 @@ public class FaceSettings extends DashboardFragment {
|
|||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
if (requestCode == CONFIRM_REQUEST) {
|
if (requestCode == CONFIRM_REQUEST) {
|
||||||
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
|
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
|
||||||
|
mFaceManager.setActiveUser(mUserId);
|
||||||
// The pin/pattern/password was set.
|
// The pin/pattern/password was set.
|
||||||
if (data != null) {
|
if (data != null) {
|
||||||
mToken = data.getByteArrayExtra(
|
mToken = data.getByteArrayExtra(
|
||||||
|
@@ -23,6 +23,7 @@ import android.content.Intent;
|
|||||||
import android.provider.SearchIndexableResource;
|
import android.provider.SearchIndexableResource;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.biometrics.face.FaceProfileStatusPreferenceController;
|
||||||
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
|
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
|
||||||
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
|
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
|
||||||
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
|
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 LockUnificationPreferenceController(context, host));
|
||||||
profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
|
profileSecurityControllers.add(new VisiblePatternProfilePreferenceController(
|
||||||
context, lifecycle));
|
context, lifecycle));
|
||||||
|
profileSecurityControllers.add(new FaceProfileStatusPreferenceController(context));
|
||||||
profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context));
|
profileSecurityControllers.add(new FingerprintProfileStatusPreferenceController(context));
|
||||||
controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
|
controllers.add(new PreferenceCategoryController(context, WORK_PROFILE_SECURITY_CATEGORY)
|
||||||
.setChildren(profileSecurityControllers));
|
.setChildren(profileSecurityControllers));
|
||||||
|
Reference in New Issue
Block a user