From 5c3fd1cea33ad4d326e8d7b62189134f08fb56f9 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Wed, 2 Jul 2014 18:16:35 -0700
Subject: [PATCH] Define a specific preferenceFragmentStyle in Settings Theme

- needed for being able to have PreferenceFragments look as the Dashboard

See bug: #15384992 Setting Dashboard - padding updates

Change-Id: I098008a131aa29594025b38dd0dc07c1cc3bffdc
---
 .../default_preference_background.xml         | 29 +++++++
 .../preference_list_fragment_background.xml   | 29 +++++++
 res/drawable/search_panel_list_background.xml | 10 +--
 res/layout/data_usage_summary.xml             |  3 +-
 res/layout/manage_applications_content.xml    |  3 +-
 res/layout/preference_list_fragment.xml       | 87 +++++++++++++++++++
 res/layout/search_panel.xml                   |  2 +-
 res/values/colors.xml                         |  4 +
 res/values/styles.xml                         |  4 +
 res/values/themes.xml                         |  3 +
 10 files changed, 166 insertions(+), 8 deletions(-)
 create mode 100644 res/drawable/default_preference_background.xml
 create mode 100644 res/drawable/preference_list_fragment_background.xml
 create mode 100644 res/layout/preference_list_fragment.xml

diff --git a/res/drawable/default_preference_background.xml b/res/drawable/default_preference_background.xml
new file mode 100644
index 00000000000..bea5d3dde57
--- /dev/null
+++ b/res/drawable/default_preference_background.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+        android:insetLeft="0dip"
+        android:insetTop="0dip"
+        android:insetRight="0dip"
+        android:insetBottom="0dip">
+
+    <shape android:shape="rectangle">
+
+        <solid android:color="@color/default_preference_background_color" />
+
+    </shape>
+
+</inset>
diff --git a/res/drawable/preference_list_fragment_background.xml b/res/drawable/preference_list_fragment_background.xml
new file mode 100644
index 00000000000..94e0381ef3f
--- /dev/null
+++ b/res/drawable/preference_list_fragment_background.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+        android:insetLeft="0dip"
+        android:insetTop="0dip"
+        android:insetRight="0dip"
+        android:insetBottom="0dip">
+
+    <shape android:shape="rectangle">
+
+        <solid android:color="@color/preference_list_fragment_background_color" />
+
+    </shape>
+
+</inset>
diff --git a/res/drawable/search_panel_list_background.xml b/res/drawable/search_panel_list_background.xml
index b2f2627f072..a31e322eed1 100644
--- a/res/drawable/search_panel_list_background.xml
+++ b/res/drawable/search_panel_list_background.xml
@@ -15,14 +15,14 @@
 -->
 
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-        android:insetLeft="@dimen/dashboard_padding_start"
-        android:insetTop="@dimen/dashboard_padding_top"
-        android:insetRight="@dimen/dashboard_padding_end"
-        android:insetBottom="@dimen/dashboard_padding_bottom">
+        android:insetLeft="0dip"
+        android:insetTop="0dip"
+        android:insetRight="0dip"
+        android:insetBottom="0dip">
 
     <shape android:shape="rectangle">
 
-        <solid android:color="@android:color/white" />
+        <solid android:color="@color/search_panel_list_background_color" />
 
     </shape>
 
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
index 1cad64837b0..66341053d5b 100644
--- a/res/layout/data_usage_summary.xml
+++ b/res/layout/data_usage_summary.xml
@@ -23,7 +23,8 @@
         android:id="@+id/tabs_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@drawable/default_preference_background">
 
         <include layout="@layout/tab_widget" />
 
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 90b2cbab69b..364a00265e8 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -22,7 +22,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@drawable/default_preference_background">
 
     <android.support.v4.view.ViewPager
             android:id="@+id/pager"
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
new file mode 100644
index 00000000000..297e33bca78
--- /dev/null
+++ b/res/layout/preference_list_fragment.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:id="@+id/container_material"
+      android:orientation="vertical"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
+      android:background="@android:color/transparent">
+
+    <ListView android:id="@android:id/list"
+              style="@style/PreferenceFragmentListSinglePane"
+              android:layout_width="match_parent"
+              android:layout_height="0px"
+              android:layout_weight="1"
+              android:paddingStart="@dimen/dashboard_padding_start"
+              android:paddingEnd="@dimen/dashboard_padding_end"
+              android:paddingTop="@dimen/dashboard_padding_top"
+              android:paddingBottom="@dimen/dashboard_padding_bottom"
+              android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
+              android:clipToPadding="false"
+              android:drawSelectorOnTop="false"
+              android:cacheColorHint="@android:color/white"
+              android:background="@drawable/preference_list_fragment_background"
+              android:elevation="@dimen/dashboard_category_elevation"
+              android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+    <TextView android:id="@android:id/empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:padding="@*android:dimen/preference_fragment_padding_side"
+              android:gravity="center"
+              android:visibility="gone" />
+
+    <RelativeLayout android:id="@+id/button_bar"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_weight="0"
+                    android:visibility="gone">
+
+        <Button android:id="@+id/back_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dip"
+                android:layout_alignParentStart="true"
+                android:text="@*android:string/back_button_label"
+                />
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true">
+
+            <Button android:id="@+id/skip_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@*android:string/skip_button_label"
+                    android:visibility="gone"
+                    />
+
+            <Button android:id="@+id/next_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@*android:string/next_button_label"
+                    />
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
+
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 64b5c20accb..d4668745deb 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -15,7 +15,7 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/dashboard"
+        android:id="@+id/search_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f46a8005fe1..ed1b3d36130 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,4 +57,8 @@
     <color name="dashboard_background_color">#ffe1e1e0</color>
     <color name="switchbar_background_color">#ff384248</color>
     <color name="switch_accent_color">#ff7fcac3</color>
+
+    <color name="default_preference_background_color">@android:color/white</color>
+    <color name="preference_list_fragment_background_color">@color/default_preference_background_color</color>
+    <color name="search_panel_list_background_color">@color/default_preference_background_color</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 99a203a5281..6d2fdd78d22 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -127,6 +127,10 @@
     <style name="SettingsPreferenceHeaderList" parent="@*android:style/PreferenceHeaderList">
     </style>
 
+    <style name="PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment">
+        <item name="android:layout">@layout/preference_list_fragment</item>
+    </style>
+
     <style name="VertDivider">
         <item name="android:layout_width">@dimen/vert_divider_width</item>
         <item name="android:layout_height">fill_parent</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index ee02768b413..3583f846151 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -74,8 +74,11 @@
         <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
         <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
         <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+        <item name="@*android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>
         <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
+
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>