From 6338695711cdb2ffcf8477116b4147fd2423181c Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Wed, 28 May 2014 20:08:55 -0700
Subject: [PATCH] Update ActionBar for using contentInsetStart

- also align SwitchBar ON/OFF text

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ie8224be169ac975b5f71ca23f0c87f385554878e
---
 res/values-sw600dp/dimens.xml | 5 +++++
 res/values/dimens.xml         | 9 ++++++---
 res/values/themes.xml         | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 0cef851b6dd..76ce9983cfc 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -44,5 +44,10 @@
 
     <!-- SwitchBar padding start -->
     <dimen name="switchbar_padding_start">80dp</dimen>
+    <!-- SwitchBar padding end -->
+    <dimen name="switchbar_padding_end">80dp</dimen>
+
+    <!-- ActionBar contentInsetStart -->
+    <dimen name="actionbar_contentInsetStart">80dp</dimen>
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 460fb449ca4..aa8ab5e8523 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -94,8 +94,11 @@
     <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>
+    <dimen name="switchbar_padding_start">84dp</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">84dp</dimen>
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c39910b7be0..366492d9f65 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -89,6 +89,12 @@
         <!-- Used by the StatusBar and NavBar -->
         <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
         <item name="android:colorAccent">@color/quantum_orange_A200</item>
+        <!-- Redefine the ActionBar style for contentInsetStart -->
+        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
+    </style>
+
+    <style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
+        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
     </style>
 
 </resources>