From 8b4d90f29747199f3ffef33b0d480d7eac9dbd6c Mon Sep 17 00:00:00 2001
From: Danny Epstein <depstein@google.com>
Date: Thu, 26 May 2016 12:50:41 -0700
Subject: [PATCH] Top and bottom padding for watch preferences.

BUG: 27779149
Change-Id: I4a2a79e249d30c58d7729876adf58935b81015e4
---
 core/res/res/layout/preference_list_fragment.xml         | 2 --
 .../res/res/layout/preference_list_fragment_material.xml | 2 --
 core/res/res/values-notround/styles_micro.xml            | 2 ++
 core/res/res/values-round/styles_micro.xml               | 9 +++++++++
 core/res/res/values/styles.xml                           | 2 ++
 core/res/res/values/themes_micro.xml                     | 4 ++++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/res/res/layout/preference_list_fragment.xml b/core/res/res/layout/preference_list_fragment.xml
index fc53a1a061b23..c43975e4ad3c7 100644
--- a/core/res/res/layout/preference_list_fragment.xml
+++ b/core/res/res/layout/preference_list_fragment.xml
@@ -33,8 +33,6 @@
             style="?attr/preferenceFragmentListStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="0dip"
-            android:paddingBottom="@dimen/preference_fragment_padding_bottom"
             android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
             android:clipToPadding="false"
             android:drawSelectorOnTop="false"
diff --git a/core/res/res/layout/preference_list_fragment_material.xml b/core/res/res/layout/preference_list_fragment_material.xml
index e411c0e92a184..db2fe7d038e06 100644
--- a/core/res/res/layout/preference_list_fragment_material.xml
+++ b/core/res/res/layout/preference_list_fragment_material.xml
@@ -32,8 +32,6 @@
         <ListView android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="0dip"
-            android:paddingBottom="@dimen/preference_fragment_padding_bottom"
             style="?attr/preferenceFragmentListStyle"
             android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
             android:clipToPadding="false"
diff --git a/core/res/res/values-notround/styles_micro.xml b/core/res/res/values-notround/styles_micro.xml
index c45e36459ab0d..1294660aa631f 100644
--- a/core/res/res/values-notround/styles_micro.xml
+++ b/core/res/res/values-notround/styles_micro.xml
@@ -17,4 +17,6 @@
     <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">
         <item name="textAlignment">viewStart</item>
     </style>
+    <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material"/>
+    <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material"/>
 </resources>
diff --git a/core/res/res/values-round/styles_micro.xml b/core/res/res/values-round/styles_micro.xml
index 7a1e5117f4722..f19addecae0c3 100644
--- a/core/res/res/values-round/styles_micro.xml
+++ b/core/res/res/values-round/styles_micro.xml
@@ -17,4 +17,13 @@
     <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">
         <item name="textAlignment">center</item>
     </style>
+    <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material">
+        <item name="paddingTop">22dp</item>
+        <item name="paddingBottom">22dp</item>
+        <item name="clipToPadding">false</item>
+    </style>
+    <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material">
+        <item name="paddingTop">22dp</item>
+        <item name="paddingBottom">22dp</item>
+    </style>
 </resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 790dcfa3f1270..273086d5a35fa 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1122,6 +1122,8 @@ please see styles_device_defaults.xml.
     <style name="PreferenceFragmentList">
         <item name="paddingStart">@dimen/preference_fragment_padding_side</item>
         <item name="paddingEnd">@dimen/preference_fragment_padding_side</item>
+        <item name="paddingTop">0dp</item>
+        <item name="paddingBottom">@dimen/preference_fragment_padding_bottom</item>
     </style>
 
     <!-- Other Misc Styles -->
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml
index 89c33b2bdf106..63a6a484a309c 100644
--- a/core/res/res/values/themes_micro.xml
+++ b/core/res/res/values/themes_micro.xml
@@ -52,6 +52,10 @@
         <item name="colorPrimary">@color/primary_micro_dark</item>
         <item name="colorAccent">@color/accent_micro_dark</item>
         <item name="colorEdgeEffect">?attr/colorPrimary</item>
+
+        <!-- Preference styles -->
+        <item name="preferenceFragmentStyle">@style/PreferenceFragment.Micro</item>
+        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Micro</item>
     </style>
 
     <style name="Theme.Micro" parent="Theme.MicroBase">