Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
#F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp
Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
diff --git a/res/layout/condition_tile_new_ui.xml b/res/layout/condition_tile_new_ui.xml
index 49bf0c0..710d2f2 100644
--- a/res/layout/condition_tile_new_ui.xml
+++ b/res/layout/condition_tile_new_ui.xml
@@ -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
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 0a3d952..6d76001 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -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"
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 86abe51..d62ae1d 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -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"
diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
index 4e1bbc8..f9d30e6 100644
--- a/res/layout/suggestion_condition_footer.xml
+++ b/res/layout/suggestion_condition_footer.xml
@@ -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>
diff --git a/res/layout/suggestion_condition_header.xml b/res/layout/suggestion_condition_header.xml
index a0f73ae..4519a46 100644
--- a/res/layout/suggestion_condition_header.xml
+++ b/res/layout/suggestion_condition_header.xml
@@ -15,62 +15,80 @@
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_centerHorizontal="true">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <FrameLayout
- android:id="@android:id/icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="24dp"
- android:layout_centerVertical="true">
+ <Space
+ android:id="@+id/top_space"
+ android:layout_width="match_parent"
+ android:layout_height="9dp"/>
- <include layout="@layout/condition_header_icon" />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="35dp"
+ android:layout_centerHorizontal="true">
- </FrameLayout>
+ <FrameLayout
+ android:id="@android:id/icon_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="24dp"
+ android:layout_centerVertical="true">
- <ImageView
- android:id="@+id/expand_indicator"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:padding="16dp"
- android:src="@drawable/ic_expand_more"/>
+ <include layout="@layout/condition_header_icon" />
- <TextView
- android:id="@android:id/summary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_toStartOf="@id/expand_indicator"
- android:layout_centerVertical="true"
- android:gravity="end"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:textColor="?android:attr/colorAccent" />
+ </FrameLayout>
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toEndOf="@android:id/icon_frame"
- android:layout_toStartOf="@android:id/summary"
- android:layout_centerVertical="true"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:textColor="?android:attr/colorAccent" />
+ <ImageView
+ android:id="@+id/expand_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:paddingTop="4dp"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:src="@drawable/ic_expand_more"/>
- <LinearLayout
- android:id="@+id/additional_icons"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_toStartOf="@android:id/summary"
- android:layout_toEndOf="@android:id/icon_frame"
- android:orientation="horizontal"
- android:gravity="center_vertical"/>
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_toStartOf="@id/expand_indicator"
+ android:layout_centerVertical="true"
+ android:gravity="end"
+ android:textAppearance="@style/TextAppearance.SuggestionTitle"
+ android:textColor="?android:attr/colorAccent" />
-</RelativeLayout>
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toEndOf="@android:id/icon_frame"
+ android:layout_toStartOf="@android:id/summary"
+ android:layout_centerVertical="true"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textAppearance="@style/TextAppearance.SuggestionTitle"
+ android:textColor="?android:attr/colorAccent" />
+
+ <LinearLayout
+ android:id="@+id/additional_icons"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_toStartOf="@android:id/summary"
+ android:layout_toEndOf="@android:id/icon_frame"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"/>
+
+ </RelativeLayout>
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="12dp"/>
+
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7f4cb79..3e80ab4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -112,4 +112,8 @@
<!-- The fallback color for tinting icons. Only used when colorControlNormal is unavailable -->
<color name="fallback_tintColor">#89000000</color>
+
+ <!-- Suggestion/condition colors -->
+ <color name="suggestion_condition_background">#f2f2f2</color>
+ <color name="condition_card_background">#f8f8f8</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 43177ff..fee7c74 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -456,7 +456,7 @@
</style>
<style name="SuggestionConditionStyle">
- <item name="android:background">@color/material_grey_300</item>
+ <item name="android:background">@color/suggestion_condition_background</item>
</style>
<style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">