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

am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard" 

* commit '5cd83c9341c04c63de136b0e1e8b581e88704075':
  Use resources for dimensions of setup wizard
main
Tadashi G. Takaoka 2013-05-15 10:58:45 -07:00 committed by Android Git Automerger
parent b00dc36b5a 5cd83c9341
commit 230068e2cd
6 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/res/layout/setup_step.xml
View File

@ -25,14 +25,14 @@
<TextView <TextView
android:id="@+id/setup_step_title" android:id="@+id/setup_step_title"
style="@style/setupStepTitleStyle" style="@style/setupStepTitleStyle"
android:paddingTop="16dp" android:paddingTop="@dimen/setup_step_vertical_padding"
android:paddingBottom="16dp" /> android:paddingBottom="@dimen/setup_step_vertical_padding" />
<TextView <TextView
android:id="@+id/setup_step_instruction" android:id="@+id/setup_step_instruction"
style="@style/setupStepInstructionStyle" style="@style/setupStepInstructionStyle"
android:paddingBottom="16dp" /> android:paddingBottom="@dimen/setup_step_vertical_padding" />
<TextView <TextView
android:id="@+id/setup_step_action_label" android:id="@+id/setup_step_action_label"
style="@style/setupStepActionLabelStyle" style="@style/setupStepActionLabelStyle"
android:layout_marginTop="2dp" /> android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
</LinearLayout> </LinearLayout>

7
java/res/layout/setup_steps_cards.xml
View File

@ -23,7 +23,7 @@
android:id="@+id/setup_step_bullets" android:id="@+id/setup_step_bullets"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/setup_step_vertical_padding"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/setup_step1_bullet" android:id="@+id/setup_step1_bullet"
@ -40,8 +40,7 @@
</LinearLayout> </LinearLayout>
<com.android.inputmethod.latin.setup.SetupStepIndicatorView <com.android.inputmethod.latin.setup.SetupStepIndicatorView
android:id="@+id/setup_step_indicator" android:id="@+id/setup_step_indicator"
android:layout_width="match_parent" style="@style/setupStepIndicatorStyle" />
android:layout_height="24dp" />
<FrameLayout <FrameLayout
android:id="@+id/setup_steps_pane" android:id="@+id/setup_steps_pane"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -60,5 +59,5 @@
android:id="@+id/setup_finish" android:id="@+id/setup_finish"
android:text="@string/setup_finish_action" android:text="@string/setup_finish_action"
style="@style/setupStepActionLabelStyle" style="@style/setupStepActionLabelStyle"
android:layout_marginTop="2dp" /> android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />
</merge> </merge>

4
java/res/layout/setup_welcome_video.xml
View File

@ -30,8 +30,8 @@
<VideoView <VideoView
android:id="@+id/setup_welcome_video" android:id="@+id/setup_welcome_video"
android:layout_weight="@integer/setup_welcome_video_weight_in_screen" android:layout_weight="@integer/setup_welcome_video_weight_in_screen"
android:layout_marginTop="24dp" android:layout_marginTop="@dimen/setup_welcome_video_vertical_margin"
android:layout_marginBottom="24dp" android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<View <View

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

@ -24,8 +24,8 @@
android:background="@color/setup_background" android:background="@color/setup_background"
android:paddingLeft="@dimen/setup_horizontal_padding" android:paddingLeft="@dimen/setup_horizontal_padding"
android:paddingRight="@dimen/setup_horizontal_padding" android:paddingRight="@dimen/setup_horizontal_padding"
android:paddingTop="16dp" android:paddingTop="@dimen/setup_vertical_padding"
android:paddingBottom="16dp"> android:paddingBottom="@dimen/setup_vertical_padding">
<include <include
android:id="@+id/setup_welcome_screen" android:id="@+id/setup_welcome_screen"
layout="@layout/setup_welcome_screen" /> layout="@layout/setup_welcome_screen" />

12
java/res/values/setup-dimens.xml
View File

@ -17,9 +17,21 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<dimen name="setup_title_text_size">46sp</dimen> <dimen name="setup_title_text_size">46sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen> <dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">22sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
<dimen name="setup_vertical_padding">16dp</dimen>
<dimen name="setup_horizontal_padding">16dp</dimen> <dimen name="setup_horizontal_padding">16dp</dimen>
<dimen name="setup_step_action_height">48dp</dimen>
<dimen name="setup_step_horizontal_padding">24dp</dimen>
<dimen name="setup_step_horizontal_padding_half">12dp</dimen>
<dimen name="setup_step_vertical_padding">16dp</dimen>
<dimen name="setup_step_horizontal_line_height">2dp</dimen>
<integer name="setup_title_weight_in_screen">40</integer> <integer name="setup_title_weight_in_screen">40</integer>
<integer name="setup_body_weight_in_screen">60</integer> <integer name="setup_body_weight_in_screen">60</integer>
<dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
<integer name="setup_welcome_video_weight_in_screen">80</integer> <integer name="setup_welcome_video_weight_in_screen">80</integer>
<integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer> <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
<integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer> <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>

28
java/res/values/setup-styles-common.xml
View File

@ -24,9 +24,13 @@
<style name="setupWelcomeDescritpionStyle" parent="setupTitleStyle"> <style name="setupWelcomeDescritpionStyle" parent="setupTitleStyle">
<item name="android:textSize">@dimen/setup_welcome_description_text_size</item> <item name="android:textSize">@dimen/setup_welcome_description_text_size</item>
</style> </style>
<style name="setupStepIndicatorStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/setup_step_indicator_height</item>
</style>
<style name="setupStepBulletStyle"> <style name="setupStepBulletStyle">
<item name="android:textColor">@color/setup_text_dark</item> <item name="android:textColor">@color/setup_text_dark</item>
<item name="android:textSize">22sp</item> <item name="android:textSize">@dimen/setup_step_bullet_text_size</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1.0</item> <item name="android:layout_weight">1.0</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
@ -37,32 +41,32 @@
<item name="android:background">@color/setup_step_background</item> <item name="android:background">@color/setup_step_background</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">24dp</item> <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item>
<item name="android:paddingRight">24dp</item> <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item>
</style> </style>
<style name="setupStepTitleStyle" parent="setupStepBaseStyle"> <style name="setupStepTitleStyle" parent="setupStepBaseStyle">
<item name="android:textSize">22sp</item> <item name="android:textSize">@dimen/setup_step_title_text_size</item>
</style> </style>
<style name="setupStepInstructionStyle" parent="setupStepBaseStyle"> <style name="setupStepInstructionStyle" parent="setupStepBaseStyle">
<item name="android:textSize">14sp</item> <item name="android:textSize">@dimen/setup_step_instruction_text_size</item>
</style> </style>
<style name="setupStepStartIndicatorStyle"> <style name="setupStepStartIndicatorStyle">
<item name="android:layout_width">24dp</item> <item name="android:layout_width">24dp</item>
<item name="android:layout_height">48dp</item> <item name="android:layout_height">@dimen/setup_step_action_height</item>
</style> </style>
<style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle"> <style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle">
<item name="android:textColor">@color/setup_step_action_color</item> <item name="android:textColor">@color/setup_step_action_color</item>
<item name="android:background">@drawable/setup_step_action_background</item> <item name="android:background">@drawable/setup_step_action_background</item>
<item name="android:layout_height">48dp</item> <item name="android:layout_height">@dimen/setup_step_action_height</item>
<item name="android:paddingLeft">12dp</item> <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding_half</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">@dimen/setup_step_action_text_size</item>
<item name="android:drawablePadding">12dp</item> <item name="android:drawablePadding">@dimen/setup_step_horizontal_padding_half</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:clickable">true</item> <item name="android:clickable">true</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
</style> </style>
<style name="setupStepStartActionLabelStyleCommon" parent="setupStepActionLabelStyleCommon"> <style name="setupStepStartActionLabelStyleCommon" parent="setupStepActionLabelStyleCommon">
<item name="android:paddingLeft">24dp</item> <item name="android:paddingLeft">@dimen/setup_step_horizontal_padding</item>
<item name="android:paddingRight">24dp</item> <item name="android:paddingRight">@dimen/setup_step_horizontal_padding</item>
</style> </style>
</resources> </resources>