commit f6aa140c3641eda9d4dabf649c8f44c30652e5b0
author Kevin Chyn <kchyn@google.com> Sat Jan 12 01:50:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 12 01:50:04 2019 +0000
tree 9d21e15286424fe2cef8628e9021553e99f76a07
parent 8b9529e533a8f9bbc4a098cc786b6ee95c1463c7
parent 43626165e37ceffcd7f826ffca0644620562cd70

Merge "Remove extra button from fingerprint enroll layout"

res/layout-land/fingerprint_enroll_enrolling.xml

diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index f96bdde..ba2c420 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -92,13 +92,6 @@
                     android:layout_height="0dp"
                     android:layout_weight="1" />
 
-                <Button
-                    android:id="@+id/skip_button"
-                    style="@style/SudGlifButton.Secondary"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
-
             </LinearLayout>
 
             <LinearLayout

res/layout-land/fingerprint_enroll_find_sensor.xml

diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index f4c97a3..28d982e 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -83,14 +83,6 @@
                         android:layout_height="0dp"
                         android:layout_weight="1" />
 
-                    <Button
-                        style="@style/SetupWizardButton.Negative"
-                        android:id="@+id/skip_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/skip_label" />
-
                 </LinearLayout>
 
             </ScrollView>