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

Commit 9a289c08 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use resources for dimensions of setup wizard"

parents 586578b7 0bff1615

java/res/layout/setup_step.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ 
    <TextView

        android:id="@+id/setup_step_title"

        style="@style/setupStepTitleStyle"

        android:paddingTop="16dp"

        android:paddingBottom="16dp" />

        android:paddingTop="@dimen/setup_step_vertical_padding"

        android:paddingBottom="@dimen/setup_step_vertical_padding" />

    <TextView

        android:id="@+id/setup_step_instruction"

        style="@style/setupStepInstructionStyle"

        android:paddingBottom="16dp" />

        android:paddingBottom="@dimen/setup_step_vertical_padding" />

    <TextView

        android:id="@+id/setup_step_action_label"

        style="@style/setupStepActionLabelStyle"

        android:layout_marginTop="2dp" />

        android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />

</LinearLayout>

java/res/layout/setup_steps_cards.xml

+3 −4
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="16dp"

        android:layout_marginTop="@dimen/setup_step_vertical_padding"

        android:orientation="horizontal">

        <TextView

            android:id="@+id/setup_step1_bullet"
@@ -40,8 +40,7 @@ 
    </LinearLayout>

    <com.android.inputmethod.latin.setup.SetupStepIndicatorView

        android:id="@+id/setup_step_indicator"

        android:layout_width="match_parent"

        android:layout_height="24dp" />

        style="@style/setupStepIndicatorStyle" />

    <FrameLayout

        android:id="@+id/setup_steps_pane"

        android:layout_width="match_parent"
@@ -60,5 +59,5 @@ 
        android:id="@+id/setup_finish"

        android:text="@string/setup_finish_action"

        style="@style/setupStepActionLabelStyle"

        android:layout_marginTop="2dp" />

        android:layout_marginTop="@dimen/setup_step_horizontal_line_height" />

</merge>

java/res/layout/setup_welcome_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
        <VideoView

            android:id="@+id/setup_welcome_video"

            android:layout_weight="@integer/setup_welcome_video_weight_in_screen"

            android:layout_marginTop="24dp"

            android:layout_marginBottom="24dp"

            android:layout_marginTop="@dimen/setup_welcome_video_vertical_margin"

            android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin"

            android:layout_width="0dp"

            android:layout_height="wrap_content" />

        <View

java/res/layout/setup_wizard.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
    android:background="@color/setup_background"

    android:paddingLeft="@dimen/setup_horizontal_padding"

    android:paddingRight="@dimen/setup_horizontal_padding"

    android:paddingTop="16dp"

    android:paddingBottom="16dp">

    android:paddingTop="@dimen/setup_vertical_padding"

    android:paddingBottom="@dimen/setup_vertical_padding">

    <include

        android:id="@+id/setup_welcome_screen"

        layout="@layout/setup_welcome_screen" />

java/res/values/setup-dimens.xml

+12 −0
Original line number Diff line number Diff line
@@ -17,9 +17,21 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <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_title_text_size">22sp</dimen>

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

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

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

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

    <dimen name="setup_step_action_height">48dp</dimen>

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

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

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

    <dimen name="setup_step_horizontal_line_height">2dp</dimen>

    <integer name="setup_title_weight_in_screen">40</integer>

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

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

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

    <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>

    <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>