Groundwork to implement landscape and welcome screen
Bug: 8159728
Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml
index 0ee24c2..1cf19d2 100644
--- a/java/res/layout/setup_wizard.xml
+++ b/java/res/layout/setup_wizard.xml
@@ -18,7 +18,7 @@
*/
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/setup_background"
@@ -26,55 +26,7 @@
android:paddingRight="@dimen/setup_horizontal_padding"
android:paddingTop="16dp"
android:paddingBottom="16dp">
- <TextView
- android:id="@+id/setup_title"
- style="@style/setupTitleStyle"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
- <LinearLayout
- android:id="@+id/setup_step_bullets"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/setup_title"
- android:paddingTop="16dp"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/setup_step1_bullet"
- style="@style/setupStepBulletStyle"
- android:text="@string/setup_step1_bullet" />
- <TextView
- android:id="@+id/setup_step2_bullet"
- style="@style/setupStepBulletStyle"
- android:text="@string/setup_step2_bullet" />
- <TextView
- android:id="@+id/setup_step3_bullet"
- style="@style/setupStepBulletStyle"
- android:text="@string/setup_step3_bullet" />
- </LinearLayout>
- <com.android.inputmethod.latin.setup.SetupStepIndicatorView
- android:id="@+id/setup_step_indicator"
- android:layout_width="match_parent"
- android:layout_height="24dp"
- android:layout_below="@id/setup_step_bullets" />
- <FrameLayout
- android:id="@+id/setup_steps_pane"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/setup_step_indicator">
- <include
- android:id="@+id/setup_step1"
- layout="@layout/setup_step" />
- <include
- android:id="@+id/setup_step2"
- layout="@layout/setup_step" />
- <include
- android:id="@+id/setup_step3"
- layout="@layout/setup_step" />
- </FrameLayout>
- <TextView
- android:id="@+id/setup_finish"
- android:text="@string/setup_finish_action"
- style="@style/setupStepActionLabelStyle"
- android:layout_below="@id/setup_steps_pane"
- android:layout_marginTop="2dp" />
-</RelativeLayout>
+ <include
+ android:id="@+id/setup_steps_screen"
+ layout="@layout/setup_steps_screen" />
+</FrameLayout>