nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ScrollView from setup wizard 

Change-Id: I85f089301d1be8ed789a20049d21e2c371cad1c5
main
Tadashi G. Takaoka 2013-04-18 15:11:33 +09:00
parent 30f102e297
commit f10046bddc
1 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
java/res/layout/setup_wizard.xml
View File

@ -18,61 +18,56 @@
*/
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<RelativeLayout
android:background="@color/setup_background"
android:paddingLeft="@dimen/setup_horizontal_padding"
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:background="@color/setup_background"
android:paddingLeft="@dimen/setup_horizontal_padding"
android:paddingRight="@dimen/setup_horizontal_padding"
android:layout_below="@id/setup_title"
android:paddingTop="16dp"
android:paddingBottom="16dp">
android:orientation="horizontal">
<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: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>
</RelativeLayout>
</ScrollView>
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: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>
</RelativeLayout>