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

Commit d59c1f83 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by The Android Automerger
Browse files

am 50259c70: Merge "Tune layout parameters of setup wizard" 

* commit '50259c70':
  Tune layout parameters of setup wizard
parent 7d9bd6f5

java/res/layout/setup_steps_cards.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:id="@+id/setup_step_bullets"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/setup_step_vertical_padding"

        android:paddingTop="@dimen/setup_step_vertical_padding"

        android:orientation="horizontal">

        <TextView

            android:id="@+id/setup_step1_bullet"

java/res/layout/setup_welcome_title.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ 
    <TextView

        android:id="@+id/setup_welcome_description"

        android:text="@string/setup_welcome_additional_description"

        android:layout_marginTop="12dp"

        android:layout_marginTop="@dimen/setup_welcome_description_top_margin"

        style="@style/setupWelcomeDescritpionStyle" />

</merge>

java/res/layout/setup_welcome_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="@dimen/setup_welcome_video_vertical_margin"

        android:paddingBottom="@dimen/setup_welcome_video_vertical_margin">

        android:paddingTop="@dimen/setup_welcome_video_top_padding"

        android:paddingBottom="@dimen/setup_welcome_video_bottom_padding">

        <LinearLayout

            android:layout_weight="@integer/setup_welcome_video_weight_in_screen"

            android:layout_width="0dp"

java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml

+4 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Setup wizard dimensions for large-tablet/portrait. -->

    <dimen name="setup_title_text_size">72sp</dimen>

    <dimen name="setup_welcome_description_text_size">36sp</dimen>

    <dimen name="setup_welcome_description_text_size">38sp</dimen>

    <dimen name="setup_step_bullet_text_size">24sp</dimen>

    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>

    <dimen name="setup_step_indicator_height">24dp</dimen>
@@ -34,7 +34,9 @@ 
    <integer name="setup_title_weight_in_screen">40</integer>

    <integer name="setup_body_weight_in_screen">60</integer>

    <dimen name="setup_title_end_margin">24dp</dimen>

    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>

    <dimen name="setup_welcome_description_top_margin">12dp</dimen>

    <dimen name="setup_welcome_video_top_padding">24dp</dimen>

    <dimen name="setup_welcome_video_bottom_padding">24dp</dimen>

    <integer name="setup_welcome_video_weight_in_screen">70</integer>

    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>

</resources>

java/res/values-h330dp-land/setup-dimens-large-phone-land.xml

+7 −5
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Setup wizard dimensions for large-phone/landscape. -->

    <dimen name="setup_title_text_size">42sp</dimen>

    <dimen name="setup_welcome_description_text_size">24sp</dimen>

    <dimen name="setup_title_text_size">40sp</dimen>

    <dimen name="setup_welcome_description_text_size">22sp</dimen>

    <dimen name="setup_step_bullet_text_size">22sp</dimen>

    <dimen name="setup_step_triangle_indicator_height">24dp</dimen>

    <dimen name="setup_step_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_title_text_size">20sp</dimen>

    <dimen name="setup_step_instruction_text_size">16sp</dimen>

    <dimen name="setup_step_action_text_size">18sp</dimen>

    <dimen name="setup_vertical_padding">16dp</dimen>

    <dimen name="setup_horizontal_padding">16dp</dimen>
@@ -34,7 +34,9 @@ 
    <integer name="setup_title_weight_in_screen">40</integer>

    <integer name="setup_body_weight_in_screen">60</integer>

    <dimen name="setup_title_end_margin">24dp</dimen>

    <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>

    <dimen name="setup_welcome_description_top_margin">10dp</dimen>

    <dimen name="setup_welcome_video_top_padding">0dp</dimen>

    <dimen name="setup_welcome_video_bottom_padding">12dp</dimen>

    <integer name="setup_welcome_video_weight_in_screen">70</integer>

    <integer name="setup_welcome_video_end_padding_weight_in_screen">30</integer>

</resources>