From a9a04efe89f77869a23a50494fe3b29465686575 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 20 May 2015 17:54:00 -0700
Subject: [PATCH] [LockScreenSetup] Move retry button to top

Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.

Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b
---
 res/layout/setup_choose_lock_pattern.xml | 30 ++++++++++--------------
 res/values/strings.xml                   |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/res/layout/setup_choose_lock_pattern.xml b/res/layout/setup_choose_lock_pattern.xml
index 6ab0d47be0c..d6bd2082f02 100644
--- a/res/layout/setup_choose_lock_pattern.xml
+++ b/res/layout/setup_choose_lock_pattern.xml
@@ -48,6 +48,13 @@
                 android:minHeight="50dip"
                 android:textSize="18sp"/>
 
+            <Button android:id="@+id/retryButton"
+                style="@android:style/Widget.Material.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/lockpattern_retry_button_text"/>
+
             <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
@@ -56,24 +63,13 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView android:id="@+id/footerText"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal">
-
-            <Button android:id="@+id/retryButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lockpattern_retry_button_text"/>
-
-            <TextView android:id="@+id/footerText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minHeight="50dip"
-                android:textSize="14sp"/>
-
-        </LinearLayout>
+            android:layout_gravity="center_horizontal"
+            android:minHeight="50dip"
+            android:textSize="14sp"
+            android:visibility="gone"/>
 
         <!-- Buttons are hidden during setup, and use the buttons in setup navigation bar instead -->
         <LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bea360617f..77db881ebe8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2920,7 +2920,7 @@
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
     <string name="lockpattern_restart_button_text">Redraw</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
-    <string name="lockpattern_retry_button_text">Retry</string>
+    <string name="lockpattern_retry_button_text">Clear</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
     <string name="lockpattern_continue_button_text">Continue</string>
     <!-- Security & location settings screen, unlock screen activity title -->