diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-23 21:02:26 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 21:02:26 -0700 |
| commit | 9ff6a6bf739e250f2ad7e868c2be55567c23fb7b (patch) | |
| tree | 3d8f92deac5d8c9cf7db423b95455cf5ba641a63 /java | |
| parent | 6a355d2d189388833148cf3850429b38d57ae9e9 (diff) | |
| parent | 3ee39be1bd21996cea54c8a3b43cefc937e5c69d (diff) | |
| download | latinime-9ff6a6bf739e250f2ad7e868c2be55567c23fb7b.tar.gz latinime-9ff6a6bf739e250f2ad7e868c2be55567c23fb7b.tar.xz latinime-9ff6a6bf739e250f2ad7e868c2be55567c23fb7b.zip | |
am 3ee39be1: Merge "Add setup wizard indicator size resource"
* commit '3ee39be1bd21996cea54c8a3b43cefc937e5c69d':
Add setup wizard indicator size resource
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/setup-dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values/setup-styles-common.xml | 5 |
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"> |