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

Merge "Update face/fingerprint consent screen UIs" into sc-dev

Browse Source
This commit is contained in:
Curtis Belmonte
2021-05-25 04:15:44 +00:00
committed by Android (Google) Code Review
parent 954389be96 937ff332f3
commit aa5ae60a37
5 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/face_enroll_introduction.xml
View File

@@ -21,7 +21,8 @@
style="?attr/face_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
app:sudDescriptionText="@string/security_settings_face_enroll_introduction_message">
<LinearLayout
style="@style/SudContentFrame"
@@ -74,6 +75,7 @@
android:paddingTop="24dp">
<ImageView
android:id="@+id/icon_glasses"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_face_enroll_introduction_glasses"/>
@@ -99,6 +101,7 @@
android:paddingTop="24dp">
<ImageView
android:id="@+id/icon_looking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_face_enroll_introduction_visibility"/>
@@ -124,6 +127,7 @@
android:paddingTop="24dp">
<ImageView
android:id="@+id/icon_security"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_face_enroll_introduction_shield"/>

9
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -17,10 +17,12 @@
<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/fingerprint_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
app:sudDescriptionText="@string/security_settings_fingerprint_enroll_introduction_message">
<LinearLayout
style="@style/SudContentFrame"
@@ -71,6 +73,7 @@
android:paddingTop="12dp">
<ImageView
android:id="@+id/icon_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
@@ -91,6 +94,7 @@
android:paddingTop="12dp">
<ImageView
android:id="@+id/icon_locked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
@@ -120,6 +124,7 @@
android:paddingTop="12dp">
<ImageView
android:id="@+id/icon_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
@@ -151,6 +156,7 @@
android:paddingTop="12dp">
<ImageView
android:id="@+id/icon_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
@@ -171,6 +177,7 @@
android:paddingTop="12dp">
<ImageView
android:id="@+id/icon_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"