c81575138e
Update the layout of the landscape fingerprint enrolling screen to be consistent with fingerprint find sensor, which vertically centers the graphic on the right. Also added back the accessibility live region for TalkBack. Bug: 30288351 Bug: 30287231 Change-Id: Ia5b429215e36bbc108585aa8b14330b77ddc8584
119 lines
4.6 KiB
XML
119 lines
4.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.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: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_lock" />
|
|
|
|
<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>
|
|
|
|
<Button
|
|
android:id="@+id/skip_button"
|
|
style="@style/SetupWizardButton.Negative"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dp"
|
|
android:text="@string/skip_label"
|
|
android:visibility="gone" />
|
|
|
|
</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="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
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>
|