From 8c5bcaa37495e1484dd83f5f389a2c54be84dc5d Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Wed, 14 Dec 2022 10:59:00 +0000
Subject: [PATCH] (2/2) Fix settings face enrollment UI layout problem

To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button

Bug: 260653042
Bug: 263065347

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
---
 res/drawable/face_enroll_icon_large.xml |  4 ++--
 res/layout/face_enroll_education.xml    | 12 ++++++++----
 res/values/dimens.xml                   | 12 ++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/res/drawable/face_enroll_icon_large.xml b/res/drawable/face_enroll_icon_large.xml
index 578a4a9b741..6d9b155e0ca 100644
--- a/res/drawable/face_enroll_icon_large.xml
+++ b/res/drawable/face_enroll_icon_large.xml
@@ -16,8 +16,8 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="300dp"
-    android:height="300dp"
+    android:width="@dimen/face_enroll_icon_large_width"
+    android:height="@dimen/face_enroll_icon_large_height"
     android:viewportWidth="300"
     android:viewportHeight="300"
     android:tint="@color/face_enroll_icon_color">
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index fec6d538c7e..908dae4f7f1 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -39,7 +39,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-24dp">
+            android:layout_marginTop="@dimen/face_enroll_education_lottie_frame_margin_top">
 
             <com.google.android.setupdesign.view.IllustrationVideoView
                 android:id="@+id/illustration_default"
@@ -52,8 +52,8 @@
             <com.airbnb.lottie.LottieAnimationView
                 android:id="@+id/illustration_lottie"
                 android:layout_width="match_parent"
-                android:layout_height="440dp"
-                android:layout_marginTop="-52dp"
+                android:layout_height="@dimen/illustration_lottie_height"
+                android:layout_marginTop="@dimen/lottie_animation_view_margin_top"
                 android:scaleType="centerInside"
                 android:visibility="gone"
                 app:lottie_autoPlay="true"
@@ -66,6 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:visibility="invisible"
+                android:layout_marginTop="@dimen/illustration_accessibility_margin_top"
                 android:src="@drawable/face_enroll_icon_large"/>
 
         </FrameLayout>
@@ -84,7 +85,7 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-24dp">
+                android:layout_marginTop="@dimen/limited_vision_button_frame_margin_top">
 
                 <Button
                     android:id="@+id/accessibility_button"
@@ -92,12 +93,15 @@
                     android:layout_gravity="center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/limited_vision_button_margin_top"
+                    android:layout_marginBottom="@dimen/limited_vision_button_margin_bottom"
                     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:layout_marginTop="@dimen/limited_vision_button_toggle_margin_top"
                     android:visibility="gone"
                     app:messageText="@string/security_settings_face_enroll_introduction_accessibility"/>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index afb6f68bb79..1f698c08952 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -513,4 +513,16 @@
     <dimen name="qrcode_icon_size">27dp</dimen>
     <!-- Margin for SD card setup completion Image -->
     <dimen name="setup_completion_margin_top">88dp</dimen>
+
+    <!-- Biometrics Face enroll education dimensions-->
+    <dimen name="face_enroll_icon_large_width">300dp</dimen>
+    <dimen name="face_enroll_icon_large_height">300dp</dimen>
+    <dimen name="illustration_lottie_height">440dp</dimen>
+    <dimen name="illustration_accessibility_margin_top">0dp</dimen>
+    <dimen name="face_enroll_education_lottie_frame_margin_top">-24dp</dimen>
+    <dimen name="lottie_animation_view_margin_top">-52dp</dimen>
+    <dimen name="limited_vision_button_frame_margin_top">-24dp</dimen>
+    <dimen name="limited_vision_button_margin_top">0dp</dimen>
+    <dimen name="limited_vision_button_margin_bottom">0dp</dimen>
+    <dimen name="limited_vision_button_toggle_margin_top">0dp</dimen>
 </resources>