Merge "Add setup wizard indicator size resource"
commit
3ee39be1bd
|
@ -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>
|
||||||
|
|
|
@ -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">
|
||||||
|
|
Loading…
Reference in New Issue