d3a07c29bf
Makes the following adjustments to the UI of the Face Unlock education screen for both the grid and traffic light enrollment flows: - Fixes issues with text being overlapped by illustrations - Prevents views from moving vertically due to state changes - Ensures no scroll is required for default locale and scaling - Adjusts the color and content of the a11y setup toggle Test: Manual: 1. Start grid-based face enrollment (e.g. from Settings > Security) 2. Proceed to "How to set up Face Unlock" screen 3. Tap "Setup for limited vision or head motion" 4. Toggle "Setup for limited vision or head motion" switch off and on 5. Repeat steps 1-4 for traffic light face enrollment Fixes: 191105436 Fixes: 191317385 Change-Id: Ie80f5b3130b5b0aeceb889f53cc2dec8c7423e47
110 lines
4.3 KiB
XML
110 lines
4.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
~ Copyright (C) 2018 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/face_layout_theme"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
app:sucHeaderText="@string/security_settings_face_enroll_education_title">
|
|
|
|
<LinearLayout
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<Space android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"/>
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="-24dp">
|
|
|
|
<com.google.android.setupdesign.view.IllustrationVideoView
|
|
android:id="@+id/illustration_default"
|
|
style="@style/SudContentIllustration"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
app:sudVideo="@raw/face_education"/>
|
|
|
|
<!-- Animation res MUST be set in code, gated by config_face_education_use_lottie. -->
|
|
<com.airbnb.lottie.LottieAnimationView
|
|
android:id="@+id/illustration_lottie"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="400dp"
|
|
android:layout_marginTop="-48dp"
|
|
android:scaleType="centerCrop"
|
|
android:visibility="gone"
|
|
app:lottie_autoPlay="true"
|
|
app:lottie_loop="true"
|
|
app:lottie_speed="1.5" />
|
|
|
|
<ImageView
|
|
android:id="@+id/illustration_accessibility"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:visibility="invisible"
|
|
android:background="@drawable/face_enroll_icon_large"/>
|
|
|
|
</FrameLayout>
|
|
|
|
<Space android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"/>
|
|
|
|
<!-- Contains the buttons and extra information text at the bottom -->
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:layout_gravity="center_horizontal|bottom">
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content">
|
|
|
|
<Button
|
|
android:id="@+id/accessibility_button"
|
|
style="@style/SudGlifButton.Secondary"
|
|
android:layout_gravity="center"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/security_settings_face_enroll_introduction_accessibility"/>
|
|
|
|
<com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
|
|
android:id="@+id/toggle_diversity"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
app:messageText="@string/security_settings_face_enroll_introduction_accessibility"/>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|