87bb772e16
1) Adds a layout for multi-biometric selection in BiometricEnrollActivity 2) Adds widgets for checkboxes 3) Shows ConfirmLock*/ChooseLock* for multi-biometric devices in BiometricEnrollActivity 4) finish()'s when loses foreground 5) Adds default string for ChooseLock* and multi-biometrics, e.g. "Set up Password + Biometrics", as well as associated plumbing to bring the user back to BiometricEnrollActivity once the credential is enrolled 6) When max templates enrolled, checkbox becomes disabled and description string is updated Bug: 162341940 Bug: 152242790 Fixes: 161742393 No effect on existing devices with the following: Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL Test: SUW Test: make -j RunSettingsRoboTests Exempt-From-Owner-Approval: Biometric-related change to EncryptionInterstitial Change-Id: I855460d50228ace24d4ec5fbe330f02ab406cc02
72 lines
2.8 KiB
XML
72 lines
2.8 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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.
|
|
-->
|
|
|
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/lock_settings_picker_title"
|
|
android:key="lock_settings_picker">
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_off"
|
|
android:title="@string/unlock_set_unlock_off_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_none"
|
|
android:title="@string/unlock_set_unlock_none_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_pattern"
|
|
android:title="@string/unlock_set_unlock_pattern_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_pin"
|
|
android:title="@string/unlock_set_unlock_pin_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_password"
|
|
android:title="@string/unlock_set_unlock_password_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_managed"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_skip_fingerprint"
|
|
android:title="@string/fingerprint_unlock_skip_fingerprint"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_skip_face"
|
|
android:title="@string/face_unlock_skip_face"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_skip_biometrics"
|
|
android:title="@string/biometrics_unlock_skip_biometrics"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="lock_settings_footer"
|
|
android:selectable="false"
|
|
settings:searchable="false"/>
|
|
|
|
</PreferenceScreen>
|