From c3febdf02f67dc057cfbadaa22a80708369da0a4 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Thu, 5 Jun 2014 12:44:35 -0700
Subject: [PATCH] Tune Dashboard layouts following UX spec

See bug: #15384992 Setting Dashboard - padding updates

Change-Id: I2554fa73ca293e10490982df58a42d293b48d311
---
 res/layout/dashboard_tile.xml | 10 +++++-----
 res/values-land/dimens.xml    |  4 ++++
 res/values/dimens.xml         | 21 ++++++++++++++-------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 5553050a4a1..8d65666134e 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -19,15 +19,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:minHeight="72dp" >
+        android:minHeight="@dimen/dashboard_tile_minimum_height" >
 
     <ImageView
             android:id="@+id/icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:scaleType="centerInside"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+            android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
             />
 
     <RelativeLayout
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 288d4e3475b..63550d7b878 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -24,4 +24,8 @@
     <integer name="keyguard_appwidget_picker_cols">2</integer>
 
     <dimen name="captioning_preview_height">100dp</dimen>
+
+    <!-- Dashboard tile minimum height -->
+    <dimen name="dashboard_tile_minimum_height">64dp</dimen>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4e4fa8e8951..11213bcbfe2 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>
 
+    <!-- ActionBar contentInsetStart -->
+    <dimen name="actionbar_contentInsetStart">16dp</dimen>
+
     <!-- Dashboard padding between each tiles within the layout -->
     <dimen name="dashboard_cell_gap">1dp</dimen>
 
@@ -98,15 +101,19 @@
     <dimen name="dashboard_category_title_height">48dp</dimen>
 
     <!-- Dashboard category title padding start -->
-    <dimen name="dashboard_category_title_padding_start">12dp</dimen>
+    <dimen name="dashboard_category_title_padding_start">16dp</dimen>
+
+    <!-- Dashboard tile minimum height -->
+    <dimen name="dashboard_tile_minimum_height">72dp</dimen>
+
+    <!-- Dashboard image tile padding start / end -->
+    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
+    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
 
     <!-- SwitchBar padding start -->
-    <dimen name="switchbar_padding_start">68dp</dimen>
-    <!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->
-    <dimen name="switchbar_padding_end">32dp</dimen>
-
-    <!-- ActionBar contentInsetStart -->
-    <dimen name="actionbar_contentInsetStart">68dp</dimen>
+    <dimen name="switchbar_padding_start">16dp</dimen>
+    <!-- SwitchBar padding end. Should be n x @*android:dimen/preference_fragment_padding_side -->
+    <dimen name="switchbar_padding_end">16dp</dimen>
 
     <!-- Search Results padding in its container -->
     <dimen name="search_results_padding_start">1dp</dimen>