From 40a66f4c1480b8adfd085b8513828b24b5950df6 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 20 May 2014 18:59:21 -0700
Subject: [PATCH] Tune SwitchBar padding

- remove hardcoded values
- use UX specs padding values for Phone and Tablet UI

Change-Id: Ic907c52860a1cc17acddd271943c8b2da20fb957
---
 res/layout/switch_bar.xml     | 4 ++--
 res/values-sw600dp/dimens.xml | 3 +++
 res/values/dimens.xml         | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 40f7aa88495..51914c9cdd5 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -23,7 +23,7 @@
               android:layout_height="wrap_content"
               android:layout_width="0dp"
               android:layout_weight="1"
-              android:paddingStart="32dp"
+              android:paddingStart="@dimen/switchbar_padding_start"
               android:layout_gravity="center_vertical"
               android:textAppearance="@style/TextAppearance.Switch"
               android:textAlignment="viewStart" />
@@ -32,6 +32,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingEnd="32dp" />
+            android:paddingEnd="@dimen/switchbar_padding_end" />
 </merge>
 
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 154b34f0fee..0cef851b6dd 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -42,4 +42,7 @@
     <!-- Dashboard padding between each tiles within the layout -->
     <dimen name="dashboard_cell_gap">8dp</dimen>
 
+    <!-- SwitchBar padding start -->
+    <dimen name="switchbar_padding_start">80dp</dimen>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fdd8ed084cf..93d98339125 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -88,6 +88,12 @@
     <!-- Dashboard padding between each tiles within the layout -->
     <dimen name="dashboard_cell_gap">4dp</dimen>
 
+    <!-- Dashboard category title layout height -->
     <dimen name="dashboard_category_title_height">48dp</dimen>
 
+    <!-- SwitchBar padding start -->
+    <dimen name="switchbar_padding_start">72dp</dimen>
+    <!-- SwitchBar padding emd -->
+    <dimen name="switchbar_padding_end">@*android:dimen/preference_fragment_padding_side</dimen>
+
 </resources>