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

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

Merge "Update suggestion card UI."

parents d3ee4e26 c04163a7

res/layout/suggestion_container.xml

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="18dp"

        android:paddingTop="14dp"

        android:paddingBottom="16dp"

        android:scrollbars="none"/>

res/layout/suggestion_tile_v2.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/suggestion_card"

    android:layout_width="328dp"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    app:cardPreventCornerOverlap="false"

    app:cardUseCompatPadding="true"
@@ -65,7 +65,7 @@ 
            android:layout_marginEnd="12dp"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.SuggestionTitleV2"

            android:ellipsize="marquee"

            android:ellipsize="end"

            android:fadingEdge="horizontal" />



        <TextView

res/layout/suggestion_tile_with_button_v2.xml

+9 −7
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/suggestion_card"

    android:layout_width="328dp"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    app:cardPreventCornerOverlap="false"

    app:cardUseCompatPadding="true"

    app:cardElevation="2dp"

    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
@@ -37,16 +38,17 @@ 


            <ImageView

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

                android:layout_width="@dimen/dashboard_tile_image_size"

                android:layout_height="@dimen/dashboard_tile_image_size"

                android:layout_width="@dimen/suggestion_card_icon_size"

                android:layout_height="@dimen/suggestion_card_icon_size"

                style="@style/SuggestionCardIcon"

                android:layout_marginTop="16dp"

                android:layout_marginBottom="8dp" />



            <ImageView

                android:id="@+id/close_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="18dp"

                android:layout_height="18dp"

                android:alpha="0.54"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"
@@ -62,8 +64,8 @@ 
            android:layout_marginStart="12dp"

            android:layout_marginEnd="12dp"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.TileTitle"

            android:ellipsize="marquee"

            android:textAppearance="@style/TextAppearance.SuggestionTitleV2"

            android:ellipsize="end"

            android:fadingEdge="horizontal" />



        <TextView

res/values-sw400dp/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
    <dimen name="support_escalation_card_padding_end">56dp</dimen>



    <!-- Suggestion cards-->

    <dimen name="suggestion_card_width_one_card">380dp</dimen>

    <dimen name="suggestion_card_width_two_cards">184dp</dimen>

    <dimen name="suggestion_card_width_multiple_cards">176dp</dimen>

    <dimen name="suggestion_card_width_one_card">384dp</dimen>

    <dimen name="suggestion_card_width_two_cards">188dp</dimen>

    <dimen name="suggestion_card_width_multiple_cards">180dp</dimen>

    <dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen>



</resources>

res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -304,9 +304,9 @@ 


    <!-- Suggestion cards size and padding -->

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

    <dimen name="suggestion_card_width_one_card">328dp</dimen>

    <dimen name="suggestion_card_width_two_cards">158dp</dimen>

    <dimen name="suggestion_card_width_multiple_cards">152dp</dimen>

    <dimen name="suggestion_card_width_one_card">332dp</dimen>

    <dimen name="suggestion_card_width_two_cards">162dp</dimen>

    <dimen name="suggestion_card_width_multiple_cards">156dp</dimen>

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

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

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