From 715713d52495c69eccb4f31fba7291ac07a33998 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Thu, 6 Jul 2017 17:03:11 -0700
Subject: [PATCH] Overlapping text over fingerprint animation

bug: 63122688
Test: Manually tested and verified using smallest & largest display
settings

Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
---
 .../fingerprint_enroll_enrolling.xml          | 169 +++++++++---------
 .../fingerprint_enroll_enrolling_base.xml     |   9 +-
 2 files changed, 94 insertions(+), 84 deletions(-)

diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 135250b499d..10fea84f7d2 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -23,102 +23,111 @@
     android:layout="@layout/suw_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
-    <LinearLayout
-        style="@style/SuwContentFrame"
+    <ScrollView
         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. -->
+        android:fillViewport="true">
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="?attr/suwMarginSides"
-            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
-            android:clipChildren="false"
+            android:orientation="horizontal"
             android:clipToPadding="false"
-            android:orientation="vertical">
+            android:clipChildren="false"
+            android:paddingBottom="0dp">
 
-            <ImageView
-                android:id="@+id/suw_layout_icon"
-                style="@style/SuwGlifIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="?attr/suwGlifHeaderGravity"
-                android:layout_marginStart="0dp"
-                android:layout_marginEnd="0dp"
-                android:src="@drawable/ic_fingerprint_header" />
+            <!-- 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:clipChildren="false"
+                android:clipToPadding="false"
+                android:orientation="vertical">
 
-            <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">
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    style="@style/SuwGlifIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="?attr/suwGlifHeaderGravity"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp"
+                    android:src="@drawable/ic_fingerprint_header" />
 
                 <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/start_message"
+                    android:id="@+id/suw_layout_title"
+                    style="@style/SuwGlifHeaderTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_start_message"/>
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        style="@style/SuwDescription.Glif"
+                        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/SuwDescription.Glif"
+                        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>
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/skip_button"
+                    style="@style/SuwGlifButton.Secondary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <include layout="@layout/fingerprint_enroll_enrolling_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"/>
 
                 <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/repeat_message"
-                    android:layout_width="match_parent"
+                    style="@style/TextAppearance.FingerprintErrorText"
+                    android:id="@+id/error_text"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+                    android:layout_marginBottom="16dp"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:accessibilityLiveRegion="polite"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
                     android:visibility="invisible"/>
 
-            </FrameLayout>
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-            <Button
-                android:id="@+id/skip_button"
-                style="@style/SuwGlifButton.Secondary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
+            </LinearLayout>
 
         </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="match_parent"
-                android:layout_height="match_parent"
-                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>
-
+    </ScrollView>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index c1d1a7f291b..60ca601d4e5 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -57,10 +57,12 @@
 
         </FrameLayout>
 
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
 
             <include layout="@layout/fingerprint_enroll_enrolling_content"
                 android:layout_width="@dimen/fingerprint_progress_bar_max_size"
@@ -73,13 +75,12 @@
                 android:id="@+id/error_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
                 android:layout_gravity="center_horizontal|bottom"
                 android:accessibilityLiveRegion="polite"
                 android:gravity="center"
                 android:visibility="invisible"/>
 
-        </FrameLayout>
+        </LinearLayout>
 
     </LinearLayout>