From c13273687a5df2d2bcc3b793b535b58504562570 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Wed, 19 Jul 2017 19:09:33 -0700
Subject: [PATCH] Fingerprint added graphic is bigger than enrolling
 progressbar

bug: 63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
---
 .../fingerprint_enroll_enrolling.xml          | 16 +++++--
 .../fingerprint_enroll_enrolling_base.xml     | 13 ++++--
 .../fingerprint_enroll_enrolling_content.xml  |  4 +-
 res/layout/fingerprint_enroll_finish_base.xml | 42 +++++++++++++------
 4 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 10fea84f7d2..9890e682187 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -108,10 +108,18 @@
                 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"/>
+                <com.android.setupwizardlib.view.FillContentLayout
+                    android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+                    android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                    android:paddingTop="0dp"
+                    android:paddingBottom="0dp"
+                    android:layout_marginVertical="24dp">
+
+                    <include layout="@layout/fingerprint_enroll_enrolling_content"
+                         android:layout_width="match_parent"
+                         android:layout_height="match_parent"
+                         android:layout_gravity="center" />
+                </com.android.setupwizardlib.view.FillContentLayout>
 
                 <TextView
                     style="@style/TextAppearance.FingerprintErrorText"
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 60ca601d4e5..00a452ca8e8 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -64,11 +64,18 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <include layout="@layout/fingerprint_enroll_enrolling_content"
+            <com.android.setupwizardlib.view.FillContentLayout
                 android:layout_width="@dimen/fingerprint_progress_bar_max_size"
                 android:layout_height="@dimen/fingerprint_progress_bar_max_size"
-                android:layout_gravity="center"
-                android:layout_marginVertical="24dp"/>
+                android:paddingTop="0dp"
+                android:paddingBottom="0dp"
+                android:layout_marginVertical="24dp">
+
+                <include layout="@layout/fingerprint_enroll_enrolling_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center" />
+            </com.android.setupwizardlib.view.FillContentLayout>
 
             <TextView
                 style="@style/TextAppearance.FingerprintErrorText"
diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml
index 1622f3ff3bd..b7abdecaae2 100644
--- a/res/layout/fingerprint_enroll_enrolling_content.xml
+++ b/res/layout/fingerprint_enroll_enrolling_content.xml
@@ -18,8 +18,8 @@
 <com.android.settings.widget.RingProgressBar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fingerprint_progress_bar"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@drawable/fp_illustration"
     android:minHeight="@dimen/fingerprint_progress_bar_min_size"
     android:progress="0" />
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index ba3d07fd023..cf9f75966b3 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -41,22 +41,40 @@
             android:minLines="3"
             android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
-        <com.android.setupwizardlib.view.FillContentLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_weight="1"
-            android:maxWidth="@dimen/fingerprint_finish_max_size"
-            android:maxHeight="@dimen/fingerprint_finish_max_size">
+            android:gravity="center"
+            android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/fingerprint_in_app_indicator"
-                style="@style/SuwContentIllustration"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@android:string/fingerprint_icon_content_description"
-                android:src="@drawable/fp_app_indicator" />
+            <com.android.setupwizardlib.view.FillContentLayout
+                android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_marginVertical="24dp"
+                android:paddingTop="0dp"
+                android:paddingBottom="0dp"
+                android:gravity="center|center_horizontal">
 
-        </com.android.setupwizardlib.view.FillContentLayout>
+                <ImageView
+                    android:id="@+id/fingerprint_in_app_indicator"
+                    style="@style/SuwContentIllustration"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="7dp"
+                    android:contentDescription="@android:string/fingerprint_icon_content_description"
+                    android:src="@drawable/fp_app_indicator" />
+            </com.android.setupwizardlib.view.FillContentLayout>
+
+            <!-- Added to align elements with fingerprint_enroll_enrolling_base -->
+            <TextView
+                style="@style/TextAppearance.FingerprintErrorText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:visibility="invisible" />
+
+        </LinearLayout>
 
     </LinearLayout>