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

Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-19 23:15:38 +00:00
committed by Android (Google) Code Review
parent 704d86baca 5f1d13e3b0
commit 00f29b707e
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>

20
res/values/strings.xml
View File

@@ -740,26 +740,6 @@
<!-- Summary for Security settings when fingerprint is not supported [CHAR LIMIT=NONE]-->
<string name="security_dashboard_summary_no_fingerprint">Screen lock</string>
<!-- Biometric enrollment for devices with multiple sensors --><skip />
<!-- Introduction title shown in biometric enrollment screen for devices that have both fingerprint and face. [CHAR LIMIT=60] -->
<string name="multi_biometric_enroll_title">Unlock your phone securely with your face and fingerprint</string>
<!-- Introduction subtitle shown in the biometric enrollment screen. [CHAR LIMIT=60] -->
<string name="multi_biometric_enroll_subtitle">You can also sign in to apps and confirm payments</string>
<!-- Section description preceding the biometric sensors available for the user to select for enrollment. [CHAR LIMIT=40] -->
<string name="multi_biometric_enroll_setup_with">Set up unlock with:</string>
<!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up face unlock. [CHAR LIMIT=32] -->
<string name="multi_biometric_enroll_face_unlock_title">Face unlock</string>
<!-- Description for a preference containing a checkbox which if selected will allow the user to set up face unlock. [CHAR LIMIT=40] -->
<string name="multi_biometric_enroll_face_unlock_description">Make unlocking your phone a breeze</string>
<!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up fingerprint unlock. [CHAR LIMIT=32] -->
<string name="multi_biometric_enroll_fingerprint_unlock_title">Fingerprint</string>
<!-- Description for a preference containing a checkbox which if selected will allow the user to set up fingerprint unlock. [CHAR LIMIT=40] -->
<string name="multi_biometric_enroll_fingerprint_unlock_description">Save time unlocking phone in your pocket</string>
<!-- Button for skipping biometric enrollment. [CHAR LIMIT=30] -->
<string name="multi_biometric_enroll_skip">Skip</string>
<!-- Button for starting biometric enrollment. [CHAR LIMIT=30] -->
<string name="multi_biometric_enroll_next">Next</string>
<!-- Face enrollment and settings --><skip />
<!-- Message shown in summary field when face unlock is set up. [CHAR LIMIT=40] -->
<string name="security_settings_face_preference_summary">Face added</string>