Updates the labels of buttons and the colors of icons shown on the fingerprint enroll intro screen to be consistent with the face enroll intro screen and match the latest mocks. Note that this commit removes some unused strings but does not add any new ones requiring l10n. Test: Manually tested face enroll from Setup Wizard and Settings Fixes: 192381823 Change-Id: Id991d4f29d6de82acd538f1853bc8a5e50cd2637
216 lines
8.8 KiB
XML
216 lines
8.8 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"
|
|
android:layout_marginStart="?attr/sudMarginStart"
|
|
android:layout_marginEnd="?attr/sudMarginEnd">
|
|
|
|
<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>
|
|
|
|
<!-- Contains the extra information text at the bottom -->
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<!-- How it works -->
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="20sp"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="24dp">
|
|
|
|
<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="16dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:id="@+id/footer_message_2"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="16sp"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="24dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_device_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="16dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:id="@+id/footer_message_3"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="16sp"/>
|
|
</LinearLayout>
|
|
|
|
<Space
|
|
android:layout_width="match_parent"
|
|
android:layout_height="24dp"/>
|
|
|
|
<!-- You're in control -->
|
|
<TextView
|
|
android:id="@+id/footer_title_1"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="20sp"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="24dp">
|
|
|
|
<ImageView
|
|
android:id="@+id/icon_trash_can"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_trash_can"/>
|
|
<Space
|
|
android:layout_width="16dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:id="@+id/footer_message_4"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="16sp"/>
|
|
</LinearLayout>
|
|
|
|
<Space
|
|
android:layout_width="match_parent"
|
|
android:layout_height="24dp"/>
|
|
|
|
<!-- Keep in mind -->
|
|
<TextView
|
|
android:id="@+id/footer_title_2"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_face_enroll_introduction_info_title"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="20sp"/>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="24dp">
|
|
|
|
<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="16dp"
|
|
android:layout_height="wrap_content"/>
|
|
<TextView
|
|
android:id="@+id/footer_message_5"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textSize="16sp"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="24dp">
|
|
|
|
<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="16dp"
|
|
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"
|
|
android:textSize="16sp"/>
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|