019593072b
1. Make FingerprintEnrollFinish stay on the back stack during "add another" 2. Remove skip button from the enrolling screen, since the user can now back out of the enrollment flow, or back to FingerprintEnrollFinish and press "done" there. Test: Run FingerprintEnrollFinishTest with `am instrument` Bug: 32054268 Change-Id: Icaf017952d6582a14b4d0904b7ee67ad22e5280d
112 lines
4.4 KiB
XML
112 lines
4.4 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.android.setupwizardlib.GlifLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout="@layout/suw_glif_blank_template"
|
|
style="?attr/fingerprint_layout_theme">
|
|
|
|
<LinearLayout
|
|
style="@style/SuwContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal"
|
|
android:clipToPadding="false"
|
|
android:clipChildren="false"
|
|
android:paddingBottom="0dp">
|
|
|
|
<!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
|
|
See layouts/fingerprint_enroll_enrolling_base.xml. -->
|
|
<LinearLayout
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginStart="?attr/suwMarginSides"
|
|
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<ImageView
|
|
android:id="@+id/suw_layout_icon"
|
|
style="@style/SuwGlifIcon"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="0dp"
|
|
android:layout_marginEnd="0dp"
|
|
android:src="@drawable/ic_fingerprint_header" />
|
|
|
|
<TextView
|
|
android:id="@+id/suw_layout_title"
|
|
style="@style/SuwGlifHeaderTitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="0dp"
|
|
android:layout_marginEnd="0dp" />
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content">
|
|
|
|
<TextView
|
|
style="@style/TextAppearance.FingerprintMessage"
|
|
android:id="@+id/start_message"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
|
|
|
|
<TextView
|
|
style="@style/TextAppearance.FingerprintMessage"
|
|
android:id="@+id/repeat_message"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_fingerprint_enroll_repeat_message"
|
|
android:visibility="invisible"/>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<FrameLayout
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_height="match_parent">
|
|
|
|
<include layout="@layout/fingerprint_enroll_enrolling_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="center"/>
|
|
|
|
<TextView
|
|
style="@style/TextAppearance.FingerprintErrorText"
|
|
android:id="@+id/error_text"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="16dp"
|
|
android:layout_gravity="center_horizontal|bottom"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:visibility="invisible"/>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</com.android.setupwizardlib.GlifLayout>
|