Use resources for dimensions of setup wizard
This is a ground work to fit the setup wizard to smaller phones and
larger tablets.
Bug: 8159728
Change-Id: Ie8e058bc3cba30cac3b31eb5a3ce975f2ee311d9
diff --git a/java/res/layout/setup_step.xml b/java/res/layout/setup_step.xml
index c6462e9..fa84902 100644
--- a/java/res/layout/setup_step.xml
+++ b/java/res/layout/setup_step.xml
@@ -25,14 +25,14 @@
<TextView
android:id="@+id/setup_step_title"
style="@style/setupStepTitleStyle"
- android:paddingTop="16dp"
- android:paddingBottom="16dp" />
+ android:paddingTop="@dimen/setup_step_vertical_padding"
+ android:paddingBottom="@dimen/setup_step_vertical_padding" />
<TextView
android:id="@+id/setup_step_instruction"
style="@style/setupStepInstructionStyle"
- android:paddingBottom="16dp" />
+ android:paddingBottom="@dimen/setup_step_vertical_padding" />
<TextView
android:id="@+id/setup_step_action_label"
style="@style/setupStepActionLabelStyle"
- android:layout_marginTop="2dp" />
+ android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
</LinearLayout>
diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml
index 17207d3..6c46461 100644
--- a/java/res/layout/setup_steps_cards.xml
+++ b/java/res/layout/setup_steps_cards.xml
@@ -23,7 +23,7 @@
android:id="@+id/setup_step_bullets"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="@dimen/setup_step_vertical_padding"
android:orientation="horizontal">
<TextView
android:id="@+id/setup_step1_bullet"
@@ -40,8 +40,7 @@
</LinearLayout>
<com.android.inputmethod.latin.setup.SetupStepIndicatorView
android:id="@+id/setup_step_indicator"
- android:layout_width="match_parent"
- android:layout_height="24dp" />
+ style="@style/setupStepIndicatorStyle" />
<FrameLayout
android:id="@+id/setup_steps_pane"
android:layout_width="match_parent"
@@ -60,5 +59,5 @@
android:id="@+id/setup_finish"
android:text="@string/setup_finish_action"
style="@style/setupStepActionLabelStyle"
- android:layout_marginTop="2dp" />
+ android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
</merge>
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 3aa4f3c..da59ec8 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -30,8 +30,8 @@
<VideoView
android:id="@+id/setup_welcome_video"
android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
- android:layout_marginTop="24dp"
- android:layout_marginBottom="24dp"
+ android:layout_marginTop="@dimen/setup_welcome_video_vertical_margin"
+ android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin"
android:layout_width="0dp"
android:layout_height="wrap_content" />
<View
diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml
index e766e4c..176f836 100644
--- a/java/res/layout/setup_wizard.xml
+++ b/java/res/layout/setup_wizard.xml
@@ -24,8 +24,8 @@
android:background="@color/setup_background"
android:paddingLeft="@dimen/setup_horizontal_padding"
android:paddingRight="@dimen/setup_horizontal_padding"
- android:paddingTop="16dp"
- android:paddingBottom="16dp">
+ android:paddingTop="@dimen/setup_vertical_padding"
+ android:paddingBottom="@dimen/setup_vertical_padding">
<include
android:id="@+id/setup_welcome_screen"
layout="@layout/setup_welcome_screen" />