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

Commit b5b61b20 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Alignment of Settings contextual homepage"

parents 4b01c846 fa621837

res/layout/homepage_condition_full_tile.xml

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

            android:id="@+id/content"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingStart="@dimen/homepage_card_icon_padding_start"

            android:paddingEnd="@dimen/homepage_full_card_padding_end"

            android:paddingEnd="@dimen/homepage_full_card_padding_end"

            android:paddingTop="@dimen/homepage_condition_full_card_padding_top"

            android:paddingTop="@dimen/homepage_condition_full_card_padding_top"

            android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"

            android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"

res/layout/homepage_condition_half_tile.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ 
        <LinearLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:orientation="vertical">

            android:orientation="vertical">
@@ -39,6 +38,7 @@ 
                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"

                android:layout_marginStart="@dimen/homepage_card_icon_padding_start"

                android:tint="?android:attr/colorAccent"/>

                android:tint="?android:attr/colorAccent"/>





            <TextView

            <TextView
@@ -47,6 +47,7 @@ 
                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:maxLines="1"

                android:maxLines="1"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_marginStart="@dimen/homepage_card_text_padding_start"

                android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"

                android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"

                android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"

                android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
@@ -57,6 +58,7 @@ 
                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:lines="2"

                android:lines="2"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_marginStart="@dimen/homepage_card_text_padding_start"

                android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"

                android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>

                android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>

res/layout/homepage_slice_deferred_setup_tile.xml

+5 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ 
        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:gravity="left"

        android:gravity="left"

        android:orientation="vertical"

        android:orientation="vertical"

        android:paddingStart="@dimen/homepage_card_padding_start"

        android:paddingEnd="@dimen/homepage_card_padding_end"

        android:paddingEnd="@dimen/homepage_card_padding_end"

        android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"

        android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"

        android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">

        android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">
@@ -35,12 +34,14 @@ 
        <ImageView

        <ImageView

            android:id="@android:id/icon"

            android:id="@android:id/icon"

            android:layout_width="@dimen/homepage_card_icon_size"

            android:layout_width="@dimen/homepage_card_icon_size"

            android:layout_height="@dimen/homepage_card_icon_size"/>

            android:layout_height="@dimen/homepage_card_icon_size"

            android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>





        <TextView

        <TextView

            android:id="@android:id/title"

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/homepage_card_text_padding_start"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"

            android:ellipsize="end"

            android:ellipsize="end"

            android:maxLines="2"

            android:maxLines="2"
@@ -51,6 +52,7 @@ 
            android:id="@android:id/summary"

            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/homepage_card_text_padding_start"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"

            android:ellipsize="end"

            android:ellipsize="end"

            android:maxLines="2"

            android:maxLines="2"
@@ -62,6 +64,7 @@ 
            style="@style/DeferredSetupCardButton"

            style="@style/DeferredSetupCardButton"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/homepage_card_text_padding_start"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"

            android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"

            android:text="@string/suggestion_button_text"/>

            android:text="@string/suggestion_button_text"/>

res/layout/homepage_slice_half_tile.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ 
            android:id="@+id/content"

            android:id="@+id/content"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:paddingTop="@dimen/homepage_half_card_padding_top"

            android:paddingTop="@dimen/homepage_half_card_padding_top"

            android:paddingBottom="@dimen/homepage_half_card_padding_bottom"

            android:paddingBottom="@dimen/homepage_half_card_padding_bottom"
@@ -39,7 +38,8 @@ 
            <ImageView

            <ImageView

                android:id="@android:id/icon"

                android:id="@android:id/icon"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"/>

                android:layout_height="@dimen/homepage_card_icon_size"

                android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>





            <TextView

            <TextView

                android:id="@android:id/title"

                android:id="@android:id/title"
@@ -48,6 +48,7 @@ 
                android:maxLines="2"

                android:maxLines="2"

                android:minLines="1"

                android:minLines="1"

                android:ellipsize="end"

                android:ellipsize="end"

                android:layout_marginStart="@dimen/homepage_card_text_padding_start"

                android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"

                android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>

                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>

res/values/dimens.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -331,7 +331,8 @@ 
    <dimen name="homepage_card_icon_size">24dp</dimen>

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

    <dimen name="homepage_card_vertical_margin">8dp</dimen>

    <dimen name="homepage_card_vertical_margin">8dp</dimen>

    <dimen name="homepage_card_side_margin">4dp</dimen>

    <dimen name="homepage_card_side_margin">4dp</dimen>

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

    <dimen name="homepage_card_icon_padding_start">14dp</dimen>

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

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

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

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

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

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

    <dimen name="homepage_half_card_padding_top">12dp</dimen>
@@ -369,13 +370,13 @@ 
    <dimen name="homepage_condition_half_card_padding_top">12dp</dimen>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <dimen name="homepage_condition_header_icons_margin_start">14dp</dimen>

    <dimen name="homepage_condition_header_indicator_padding_top">4dp</dimen>

    <dimen name="homepage_condition_header_indicator_padding_top">4dp</dimen>

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

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

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

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