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

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

Merge "Update suggestion UI"

parents 7bd80f15 7fa083ec

res/layout/suggestion_container.xml

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

    android:paddingTop="10dp"

    android:orientation="vertical">



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="14dp"

        android:paddingBottom="16dp"

        android:paddingTop="12dp"

        android:paddingBottom="13dp"

        android:scrollbars="none"/>



</LinearLayout>

res/layout/suggestion_tile.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
            android:layout_marginStart="12dp"

            android:layout_marginEnd="12dp"

            android:singleLine="true"

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

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

            android:ellipsize="end"

            android:fadingEdge="horizontal" />

res/layout/suggestion_tile_with_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
            android:layout_marginStart="12dp"

            android:layout_marginEnd="12dp"

            android:singleLine="true"

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

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

            android:ellipsize="end"

            android:fadingEdge="horizontal" />
@@ -84,6 +84,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:layout_marginBottom="18dp"

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



    </LinearLayout>

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ 
    <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_outer_margin">14dp</dimen>

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

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

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

res/values/styles.xml

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


    <style name="TextAppearance.SuggestionHeader"

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

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

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

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

    </style>
@@ -334,12 +333,7 @@ 


    <style name="TextAppearance.SuggestionTitle"

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

        <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>

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

    </style>



    <style name="TextAppearance.SuggestionSummary" parent="TextAppearance.Small">
@@ -474,7 +468,6 @@ 


    <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">