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

am 3ee39be1: Merge "Add setup wizard indicator size resource" 

* commit '3ee39be1bd21996cea54c8a3b43cefc937e5c69d':
  Add setup wizard indicator size resource
main
Tadashi G. Takaoka 2013-04-23 21:02:26 -07:00 committed by Android Git Automerger
parent 6a355d2d18 3ee39be1bd
commit 9ff6a6bf73
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@
<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_bullet_text_size">22sp</dimen>
<dimen name="setup_step_indicator_height">24dp</dimen> <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">22sp</dimen> <dimen name="setup_step_title_text_size">22sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen> <dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen> <dimen name="setup_step_action_text_size">18sp</dimen>

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

@ -26,7 +26,7 @@
</style> </style>
<style name="setupStepIndicatorStyle"> <style name="setupStepIndicatorStyle">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/setup_step_indicator_height</item> <item name="android:layout_height">@dimen/setup_step_triangle_indicator_height</item>
</style> </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>
@ -51,7 +51,8 @@
<item name="android:textSize">@dimen/setup_step_instruction_text_size</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> <!-- The triangle indicator here is placed sideways. -->
<item name="android:layout_width">@dimen/setup_step_triangle_indicator_height</item>
<item name="android:layout_height">@dimen/setup_step_action_height</item> <item name="android:layout_height">@dimen/setup_step_action_height</item>
</style> </style>
<style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle"> <style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle">