aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-24 04:01:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-24 04:01:04 +0000
commit3ee39be1bd21996cea54c8a3b43cefc937e5c69d (patch)
tree3d8f92deac5d8c9cf7db423b95455cf5ba641a63
parent197a2d32e1f74470f0cd0b9ba391b1b836e44430 (diff)
parent81b4661f9660c9247f20daee700a39e28048f7d0 (diff)
downloadlatinime-3ee39be1bd21996cea54c8a3b43cefc937e5c69d.tar.gz
latinime-3ee39be1bd21996cea54c8a3b43cefc937e5c69d.tar.xz
latinime-3ee39be1bd21996cea54c8a3b43cefc937e5c69d.zip
Merge "Add setup wizard indicator size resource"
-rw-r--r--java/res/values/setup-dimens.xml2
-rw-r--r--java/res/values/setup-styles-common.xml5
2 files changed, 4 insertions, 3 deletions
diff --git a/java/res/values/setup-dimens.xml b/java/res/values/setup-dimens.xml
index dac544029..5abc28982 100644
--- a/java/res/values/setup-dimens.xml
+++ b/java/res/values/setup-dimens.xml
@@ -18,7 +18,7 @@
<dimen name="setup_title_text_size">46sp</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_triangle_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>
diff --git a/java/res/values/setup-styles-common.xml b/java/res/values/setup-styles-common.xml
index f5f59dda8..686decfba 100644
--- a/java/res/values/setup-styles-common.xml
+++ b/java/res/values/setup-styles-common.xml
@@ -26,7 +26,7 @@
</style>
<style name="setupStepIndicatorStyle">
<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 name="setupStepBulletStyle">
<item name="android:textColor">@color/setup_text_dark</item>
@@ -51,7 +51,8 @@
<item name="android:textSize">@dimen/setup_step_instruction_text_size</item>
</style>
<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>
</style>
<style name="setupStepActionLabelStyleCommon" parent="setupStepBaseStyle">