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

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

Merge "Update suggestion/condition UI"

parents e8afdb81 5b333254

res/layout/condition_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        app:cardUseCompatPadding="true"

        app:cardElevation="2dp">

        app:cardElevation="2dp"

        app:cardCornerRadius="@dimen/suggestion_card_corner_radius">



        <android.support.v7.widget.RecyclerView

            android:id="@+id/data"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@color/material_grey_300"

            android:scrollbars="none"/>



    </android.support.v7.widget.CardView>

res/layout/condition_tile.xml

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@color/condition_card_background"

    android:orientation="vertical">



    <LinearLayout

res/layout/suggestion_container.xml

+1 −1
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="10dp"

    android:paddingTop="2dp"

    android:orientation="vertical">



    <LinearLayout

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> 
        holder.title.setText(suggestion.getTitle());

        holder.title.setSingleLine(suggestionCount == 1);

        holder.title.setTypeface(Typeface.create(

            mContext.getString(com.android.internal.R.string.config_headlineFontFamilyMedium),

            mContext.getString(com.android.internal.R.string.config_headlineFontFamily),

            Typeface.NORMAL));



        if (suggestionCount == 1) {