08f90ddb2d
Replaces the existing MP4 shown on the face enroll intro/consent screen with an updated lock asset that matches the current SUW theme. Also updates the colors of assets and text on these screens for face and fingerprint so that the two match. Test: Manually tested both enrollments for dark and light system themes Bug: 187681255 Change-Id: I119da913cfc76e02160f2efc4654cecf33f1f049
205 lines
8.6 KiB
XML
205 lines
8.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2015 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/fingerprint_layout_theme"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
app:sudDescriptionText="@string/security_settings_fingerprint_enroll_introduction_message">
|
|
|
|
<LinearLayout
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<com.google.android.setupdesign.view.RichTextView
|
|
android:id="@+id/error_text"
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginVertical="12dp">
|
|
|
|
<ImageView
|
|
style="@style/SudContentIllustration"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/fingerprint_enroll_introduction" />
|
|
|
|
</FrameLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<!-- How it works -->
|
|
<com.google.android.setupdesign.view.RichTextView
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textAlignment="viewStart"
|
|
android:paddingTop="12dp"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="12dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_fingerprint"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_fingerprint_24dp"/>
|
|
<Space
|
|
android:layout_width="24dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_2"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="12dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_locked"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_device_locked_24dp"/>
|
|
<Space
|
|
android:layout_width="24dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_3"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
</LinearLayout>
|
|
|
|
<!-- You're in control -->
|
|
<com.google.android.setupdesign.view.RichTextView
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textAlignment="viewStart"
|
|
android:paddingTop="12dp"
|
|
android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_1"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="12dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_delete"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_trash_can"/>
|
|
<Space
|
|
android:layout_width="24dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_4"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<!-- Keep in mind -->
|
|
<com.google.android.setupdesign.view.RichTextView
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textAlignment="viewStart"
|
|
android:paddingTop="12dp"
|
|
android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_2"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="12dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_info"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_info_outline_24dp"/>
|
|
<Space
|
|
android:layout_width="24dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_5"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="12dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_link"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_link_24dp"/>
|
|
<Space
|
|
android:layout_width="24dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more"
|
|
android:textColor="?android:attr/textColorPrimary"/>
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|