cddf296c82
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code. 2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag. 3. If description text view has overlap with udfps progress view, hide the description text view. Test: atest FingerprintEnrollEnrollingTest Test: manually test by setting both display and text largest size and start enrolling fingerprint; the description is hidden if it's too long. Bug: 260970216 Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
101 lines
4.0 KiB
XML
101 lines
4.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2021 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"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout="@layout/sud_glif_blank_template"
|
|
style="?attr/fingerprint_layout_theme">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal"
|
|
android:clipToPadding="false"
|
|
android:clipChildren="false">
|
|
|
|
<!-- 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:id="@+id/layout_container"
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginStart="?attr/sudMarginStart"
|
|
android:layout_marginEnd="@dimen/enroll_margin_end"
|
|
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
|
|
android:paddingStart="@dimen/enroll_padding_start"
|
|
android:paddingEnd="@dimen/enroll_padding_end"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<ScrollView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:fillViewport="true">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<ImageView
|
|
android:id="@+id/sud_layout_icon"
|
|
style="@style/SudGlifIcon"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:scaleType="fitStart"
|
|
android:layout_marginStart="0dp"
|
|
android:layout_marginEnd="0dp"
|
|
android:src="@drawable/ic_lock" />
|
|
|
|
<TextView
|
|
android:id="@+id/suc_layout_title"
|
|
style="@style/SudGlifHeaderTitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="0dp"
|
|
android:layout_marginEnd="0dp" />
|
|
|
|
<TextView
|
|
style="@style/SudDescription.Glif"
|
|
android:id="@+id/sud_layout_subtitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1" />
|
|
|
|
</LinearLayout>
|
|
|
|
</ScrollView>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<include layout="@layout/udfps_enroll_view" />
|
|
</com.google.android.setupdesign.GlifLayout> |