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

Remove multi-biometric interstitial screen in SUW

Browse Source 
On devices with multiple biometric sensors, this removes the
interstitial screen in Setup Wizard that let the user choose whether to
enroll face, fingerprint, or both. Instead, such devices will always
show face enrollment followed by fingerprint, with the option to skip
either or both.

Test: Manually tested all enroll/skip combinations in SUW

Fixes: 183720580
Change-Id: I7f045579f732196bde28dd96e9443e4bb4c906ae
This commit is contained in:
Curtis Belmonte
2021-04-16 15:09:03 -07:00
parent 4752ea17b9
commit 5f1d13e3b0
7 changed files with 18 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
res/layout/biometric_enroll_checkbox.xml
View File

@@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 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.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Icon -->
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentStart="true" />
<!-- Title -->
<com.google.android.setupdesign.view.RichTextView
style="@style/SudDescription.Glif"
android:id="@+id/title"
android:paddingHorizontal="8dp"
android:paddingTop="16dp"
android:layout_marginBottom="4dp"
android:gravity="start"
android:layout_toEndOf="@+id/icon"
android:layout_toStartOf="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<!-- Description -->
<TextView
android:id="@+id/description"
android:paddingHorizontal="8dp"
android:paddingBottom="16dp"
android:layout_toEndOf="@+id/icon"
android:layout_toStartOf="@+id/checkbox"
android:layout_below="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<!-- Check Box -->
<CheckBox
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/checkbox"
android:layout_centerVertical="true"
android:checked="true"/>
</RelativeLayout>

79
res/layout/biometric_enroll_layout.xml
View File

@@ -1,79 +0,0 @@
<?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"
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"
app:title="@string/multi_biometric_enroll_face_unlock_title"
app:description="@string/multi_biometric_enroll_face_unlock_description"
app: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"
app:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
app:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
app:icon="@drawable/ic_fingerprint_24dp"/>
<include layout="@layout/horizontal_divider"/>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>