Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b689e661 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

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

* commit '9ff6a6bf':
  Add setup wizard indicator size resource
parents 1f4b7481 9ff6a6bf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>
+3 −2
Original line number Diff line number Diff line
@@ -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">