commit cddf296c8255f12e178cad3afc4e40279a3c381b
author Hao Dong <spdonghao@google.com> Wed May 10 21:48:07 2023 +0000
committer Hao Dong <spdonghao@google.com> Thu May 11 17:34:07 2023 +0000
tree c001583c062f17f3a31aa11b8ad71905f540be15
parent 557694755533e1f66a727744a6ecaa04eff5c1b7

Hide description text view if there is overlap.

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

res/layout-land/udfps_enroll_enrolling.xml

diff --git a/res/layout-land/udfps_enroll_enrolling.xml b/res/layout-land/udfps_enroll_enrolling.xml
index f323788..743684f 100644
--- a/res/layout-land/udfps_enroll_enrolling.xml
+++ b/res/layout-land/udfps_enroll_enrolling.xml
@@ -96,4 +96,6 @@
         </LinearLayout>
 
     </LinearLayout>
+
+    <include layout="@layout/udfps_enroll_view" />
 </com.google.android.setupdesign.GlifLayout>
\ No newline at end of file

res/layout/udfps_enroll_enrolling.xml

diff --git a/res/layout/udfps_enroll_enrolling.xml b/res/layout/udfps_enroll_enrolling.xml
index c97591d..05556ff 100644
--- a/res/layout/udfps_enroll_enrolling.xml
+++ b/res/layout/udfps_enroll_enrolling.xml
@@ -18,6 +18,7 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -41,10 +42,11 @@
           <FrameLayout
               android:id="@+id/layout_container"
               android:layout_width="match_parent"
-              android:layout_height="wrap_content"
+              android:layout_height="0dp"
               android:clipChildren="false"
               android:clipToPadding="false"
-              android:layout_gravity="center_horizontal|bottom">
+              android:layout_gravity="center_horizontal|bottom"
+              tools:ignore="Suspicious0dp">
 
               <!-- Animation res MUST be set in code -->
               <com.airbnb.lottie.LottieAnimationView
@@ -59,6 +61,9 @@
                   android:clipChildren="false"
                   android:clipToPadding="false"
                   app:lottie_speed=".85" />
+
+              <include layout="@layout/udfps_enroll_view" />
+
           </FrameLayout>
 
           <TextView