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

Commit a674aa69 authored by Doris Ling's avatar Doris Ling Committed by android-build-merger
Browse files

Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev 

am: 91ca9f60

Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
parents 43a49fca 91ca9f60

res/layout/condition_tile_new_ui.xml

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorSecondary"

    android:background="@color/condition_card_background"

    android:orientation="vertical">



    <LinearLayout

res/layout/search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/material_grey_300">

        android:background="@color/suggestion_condition_background">

        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

res/layout/settings_main_dashboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/material_grey_300">

        android:background="@color/suggestion_condition_background">

        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

res/layout/suggestion_condition_footer.xml

+5 −4
Original line number Diff line number Diff line
@@ -19,15 +19,16 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="56dp"

    android:layout_height="44dp"

    android:paddingTop="4dp"

    android:paddingEnd="16dp"

    android:orientation="horizontal"

    android:gravity="center|end">

    android:gravity="end">



    <ImageView

        android:id="@+id/collapse_button"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:padding="16dp"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_expand_less"/>



</LinearLayout>

res/layout/suggestion_condition_header.xml

+74 −56
Original line number Diff line number Diff line
@@ -15,11 +15,21 @@ 
     limitations under the License.

-->



<RelativeLayout

<LinearLayout

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

    style="@style/SuggestionConditionStyle"

    android:layout_width="match_parent"

    android:layout_height="56dp"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <Space

        android:id="@+id/top_space"

        android:layout_width="match_parent"

        android:layout_height="9dp"/>



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="35dp"

        android:layout_centerHorizontal="true">



        <FrameLayout
@@ -38,7 +48,9 @@ 
            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentEnd="true"

        android:padding="16dp"

            android:paddingTop="4dp"

            android:paddingStart="16dp"

            android:paddingEnd="16dp"

            android:src="@drawable/ic_expand_more"/>



        <TextView
@@ -74,3 +86,9 @@ 
            android:gravity="center_vertical"/>



    </RelativeLayout>



    <Space

        android:layout_width="match_parent"

        android:layout_height="12dp"/>



</LinearLayout>