commit 30f102e297d4e4afc28b3aad688fe72e814452e7
author Tadashi G. Takaoka <takaoka@google.com> Thu Apr 18 15:11:33 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Apr 19 12:43:40 2013 +0900
tree 78c6a8d59c477ec68901348ce8a12e5df87f2fb9
parent 1f6e06cf9244cdd8803ee653f948e169c190b067

Move some attributes of setup wizard layouts to style files

Change-Id: I7b5999253c959531212ee27ac1ddfe39de280e2c

java/res/layout/setup_step.xml

diff --git a/java/res/layout/setup_step.xml b/java/res/layout/setup_step.xml
index c15d07b..c6462e9 100644
--- a/java/res/layout/setup_step.xml
+++ b/java/res/layout/setup_step.xml
@@ -25,34 +25,14 @@
     <TextView
         android:id="@+id/setup_step_title"
         style="@style/setupStepTitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp" />
+        android:paddingBottom="16dp" />
     <TextView
         android:id="@+id/setup_step_instruction"
         style="@style/setupStepInstructionStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp" />
-    <Button
+        android:paddingBottom="16dp" />
+    <TextView
         android:id="@+id/setup_step_action_label"
         style="@style/setupStepActionLabelStyle"
-        android:gravity="center_vertical"
-        android:drawablePadding="12dp"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:paddingLeft="12dp"
-        android:paddingStart="12dp"
-        android:paddingRight="24dp"
-        android:paddingEnd="24dp" />
+        android:layout_marginTop="2dp" />
 </LinearLayout>

java/res/layout/setup_wizard.xml

diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml
index 6e2d19f..56d4d2f 100644
--- a/java/res/layout/setup_wizard.xml
+++ b/java/res/layout/setup_wizard.xml
@@ -33,10 +33,7 @@
         <TextView
             android:id="@+id/setup_title"
             style="@style/setupTitleStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true" />
         <LinearLayout
             android:id="@+id/setup_step_bullets"