PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The index implementation for face unlock settings."

Browse Source
This commit is contained in:
Stanley Wang
2019-12-31 15:11:21 +00:00
committed by Android (Google) Code Review
parent 82c437128d e81d6b7b31
commit 74e42c7d6f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/security_settings_face.xml
View File

@@ -71,17 +71,19 @@
android:title="@string/security_settings_face_preference_title">
<com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_delete_faces_container"
android:title="@string/security_settings_face_settings_remove_face_data"
android:selectable="false"
android:layout="@layout/face_remove_button"
settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_enroll_faces_container"
android:title="@string/security_settings_face_settings_enroll"
android:selectable="false"
android:layout="@layout/face_enroll_button "
android:layout="@layout/face_enroll_button"
settings:allowDividerBelow="true"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
settings:allowDividerAbove="true"/>
</PreferenceScreen>
</PreferenceScreen>

16
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -56,6 +56,11 @@ public class FaceSettings extends DashboardFragment {
private static final String TAG = "FaceSettings";
private static final String KEY_TOKEN = "hw_auth_token";
private static final String PREF_KEY_DELETE_FACE_DATA =
"security_settings_face_delete_faces_container";
private static final String PREF_KEY_ENROLL_FACE_UNLOCK =
"security_settings_face_enroll_faces_container";
private UserManager mUserManager;
private FaceManager mFaceManager;
private int mUserId;
@@ -309,6 +314,15 @@ public class FaceSettings extends DashboardFragment {
protected boolean isPageSearchEnabled(Context context) {
return isAvailable(context);
}
};
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
final FaceManager faceManager = context.getSystemService(FaceManager.class);
final boolean hasEnrolled = faceManager.hasEnrolledTemplates(
UserHandle.myUserId());
keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK : PREF_KEY_DELETE_FACE_DATA);
return keys;
}
};
}