Merge \"Update UI style for GLIF buttons\" into nyc-mr1-dev

am: a028010c23

Change-Id: Ic19e5d4909fbd7c2d7841e12cfec29b264d144a6

res/layout/fingerprint_enroll_enrolling_base.xml

@@ -75,7 +75,6 @@
             style="@style/SetupWizardButton.Negative"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
             android:text="@string/skip_label"
             android:visibility="gone" />
 

res/layout/fingerprint_enroll_finish_base.xml

@@ -72,11 +72,9 @@
             android:layout_weight="1"/>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="-12dp"
             android:layout_marginBottom="4dp"
-            android:layout_gravity="end"
             android:orientation="horizontal">
 
             <Button
@@ -86,6 +84,11 @@
                 android:layout_height="wrap_content"
                 android:text="@string/fingerprint_enroll_button_add" />
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
             <Button
                 style="@style/SetupWizardButton.Positive"
                 android:id="@+id/next_button"

res/layout/setup_choose_lock_password.xml

@@ -64,6 +64,11 @@
                 android:layout_height="wrap_content"
                 android:text="@string/lockpassword_cancel_label" />
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
             <!-- right : continue -->
             <Button android:id="@+id/next_button"
                 style="@style/SetupWizardButton.Positive"

res/layout/setup_choose_lock_pattern_common.xml

@@ -56,7 +56,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="end"
                 android:orientation="horizontal">
 
                 <!-- left : cancel, or re-try -->
@@ -66,6 +65,11 @@
                     android:layout_height="wrap_content"
                     android:text="@string/lockpattern_tutorial_cancel_label" />
 
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
                 <!-- right : confirm or ok -->
                 <Button android:id="@+id/footerRightButton"
                     style="@style/SetupWizardButton.Positive"