Tune Search layouts following UX spec
See bug: #15384992 Setting Dashboard - padding updates
Change-Id: Ia7839459b3d67529db55e70c0ecda3da9b37d840
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 80c3a26..a0049be 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:minHeight="@dimen/dashboard_tile_minimum_height" >
+ android:minHeight="@dimen/dashboard_tile_minimum_height">
<ImageView
android:id="@+id/icon"
diff --git a/res/layout/search_result_item.xml b/res/layout/search_result_item.xml
index 30d6fc0..8e537d5 100644
--- a/res/layout/search_result_item.xml
+++ b/res/layout/search_result_item.xml
@@ -19,7 +19,6 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingStart="@*android:dimen/preference_item_padding_side"
android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout
@@ -31,12 +30,11 @@
<ImageView
android:id="@+id/icon"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_gravity="center"
- android:minWidth="48dp"
+ android:layout_width="@dimen/search_result_item_image_size"
+ android:layout_height="@dimen/search_result_item_image_size"
android:scaleType="centerInside"
- android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+ android:layout_marginStart="@dimen/search_result_item_image_margin_start"
+ android:layout_marginEnd="@dimen/search_result_item_image_margin_end"
/>
</LinearLayout>
@@ -44,10 +42,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingEnd="@*android:dimen/preference_item_padding_inner"
- android:paddingTop="6dip"
- android:paddingBottom="6dip">
+ android:layout_weight="1">
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml
index 49df3ca..b92a7f0 100644
--- a/res/layout/search_suggestion_item.xml
+++ b/res/layout/search_suggestion_item.xml
@@ -18,15 +18,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:paddingStart="@*android:dimen/preference_item_padding_side"
- android:paddingEnd="?android:attr/scrollbarSize">
+ android:gravity="center_vertical">
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingStart="@*android:dimen/preference_item_padding_inner"
- android:paddingEnd="@*android:dimen/preference_item_padding_inner"
+ android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 6108213..fe42d69 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -45,7 +45,7 @@
<!-- Dashboard category title padding start -->
<dimen name="dashboard_category_title_padding_start">24dp</dimen>
- <!-- Dashboard image tile padding start / end -->
+ <!-- Dashboard tile image padding start / end -->
<dimen name="dashboard_tile_image_margin_start">24dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
@@ -57,4 +57,8 @@
<!-- Search title (recent / results) padding start -->
<dimen name="search_title_padding_start">24dp</dimen>
+ <!-- Result item image margin start / end -->
+ <dimen name="search_result_item_image_margin_start">24dp</dimen>
+ <dimen name="search_result_item_image_margin_end">32dp</dimen>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b8fe0df..f1764fb 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -87,6 +87,9 @@
<dimen name="notification_app_settings_divider_height">48dp</dimen>
<dimen name="zen_mode_dropdown_width">160dp</dimen>
+ <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
+ <dimen name="caption_preview_text_size">48dp</dimen>
+
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">16dp</dimen>
@@ -109,7 +112,7 @@
<!-- Dashboard image tile size -->
<dimen name="dashboard_tile_image_size">24dp</dimen>
- <!-- Dashboard image tile padding start / end -->
+ <!-- Dashboard tile image margin start / end -->
<dimen name="dashboard_tile_image_margin_start">16dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
@@ -125,6 +128,11 @@
<!-- Search title (recent / results) padding start -->
<dimen name="search_title_padding_start">16dp</dimen>
- <!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
- <dimen name="caption_preview_text_size">48dp</dimen>
+ <!-- Result item image size -->
+ <dimen name="search_result_item_image_size">24dp</dimen>
+
+ <!-- Result item image margin start / end -->
+ <dimen name="search_result_item_image_margin_start">16dp</dimen>
+ <dimen name="search_result_item_image_margin_end">32dp</dimen>
+
</resources>