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
81 lines
3.4 KiB
XML
81 lines
3.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
~ Copyright (C) 2020 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.
|
|
-->
|
|
|
|
<com.google.android.setupdesign.GlifLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:BiometricEnrollCheckbox="http://schemas.android.com/apk/res/com.android.settings"
|
|
style="?attr/face_layout_theme"
|
|
app:sucHeaderText="@string/multi_biometric_enroll_title"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<LinearLayout
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<com.google.android.setupdesign.view.RichTextView
|
|
android:id="@+id/sud_layout_description"
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/multi_biometric_enroll_subtitle"/>
|
|
|
|
<com.google.android.setupdesign.view.IllustrationVideoView
|
|
android:id="@+id/illustration_normal"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
style="@style/SudContentIllustration"
|
|
app:sudVideo="@raw/face_settings"/>
|
|
|
|
<TextView
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/setup_with"
|
|
android:text="@string/multi_biometric_enroll_setup_with"
|
|
android:gravity="start"/>
|
|
|
|
<include layout="@layout/horizontal_divider"/>
|
|
|
|
<com.android.settings.biometrics.BiometricEnrollCheckbox
|
|
android:id="@+id/checkbox_face"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_face_unlock_title"
|
|
BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_face_unlock_description"
|
|
BiometricEnrollCheckbox:icon="@drawable/ic_face_24dp"/>
|
|
|
|
<include layout="@layout/horizontal_divider"/>
|
|
|
|
<com.android.settings.biometrics.BiometricEnrollCheckbox
|
|
android:id="@+id/checkbox_fingerprint"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
BiometricEnrollCheckbox:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
|
|
BiometricEnrollCheckbox:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
|
|
BiometricEnrollCheckbox:icon="@drawable/ic_fingerprint_24dp"/>
|
|
|
|
<include layout="@layout/horizontal_divider"/>
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|