commit ba313c03472987281865e1d9805516d88e3c8f0d
author Ajay Nadathur <ajayns@google.com> Tue Jul 11 11:45:08 2017 -0700
committer Ajay Nadathur <ajayns@google.com> Tue Jul 11 18:49:53 2017 -0700
tree 7ff0b842a4b73919106d73f05f808f651792788b
parent 8dc795d64b7cb828eea92f765552cc9bb2cd83a6

Remove next button from FingerprintEnroll screen

bug: 63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040

res/layout/fingerprint_enroll_find_sensor_base.xml

diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index 44455c5..ea518a7 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -24,23 +24,17 @@
     android:layout_height="match_parent"
     app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <include
-            layout="@layout/fingerprint_enroll_find_sensor_graphic"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal|bottom"/>
-
         <LinearLayout
             style="@style/SuwContentFrame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:clipToPadding="false"
             android:clipChildren="false">
@@ -51,21 +45,18 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-            <View
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"/>
-
-            <Button
-                style="@style/SuwGlifButton.Secondary"
-                android:id="@+id/next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_gravity="end"
-                android:text="@string/fingerprint_enroll_button_next" />
-
         </LinearLayout>
-    </FrameLayout>
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <include
+            layout="@layout/fingerprint_enroll_find_sensor_graphic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
+
+    </LinearLayout>
 </com.android.setupwizardlib.GlifLayout>