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

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

Merge "Update layout config for suggestion card."

parents eb4dceea e0625129

res/layout/suggestion_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="20dp"

    android:paddingTop="12dp"

    android:orientation="vertical">



    <LinearLayout
@@ -55,7 +55,7 @@ 
        android:id="@+id/suggestion_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="20dp"

        android:paddingTop="18dp"

        android:paddingBottom="16dp"

        android:scrollbars="none"/>

res/layout/suggestion_tile_v2.xml

+5 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:id="@+id/suggestion_card"

    android:layout_width="328dp"

    android:layout_height="wrap_content"

    app:cardPreventCornerOverlap="false"

    app:cardUseCompatPadding="true"

    app:cardElevation="2dp"

    app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
@@ -45,8 +46,9 @@ 


            <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,7 +64,7 @@ 
            android:layout_marginStart="12dp"

            android:layout_marginEnd="12dp"

            android:singleLine="true"

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

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

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

res/values/styles.xml

+7 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ 


    <style name="TextAppearance.SuggestionHeader"

           parent="@android:style/TextAppearance.Material.Subhead">

        <item name="android:fontFamily">sans-serif-medium</item>

        <item name="android:fontFamily">@config/config_headlineFontFamilyMedium</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>
@@ -337,6 +337,11 @@ 
        <item name="android:fontFamily">sans-serif-medium</item>

    </style>



    <style name="TextAppearance.SuggestionTitleV2"

           parent="@android:style/TextAppearance.Material.Subhead">

        <item name="android:fontFamily">@config/config_headlineFontFamily</item>

    </style>



    <style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>
@@ -469,6 +474,7 @@ 


    <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">

        <item name="android:textSize">@dimen/search_bar_text_size</item>

        <item name="android:fontFamily">@config/config_headlineFontFamily</item>

    </style>



    <style name="device_info_dialog_label">