From 8677d04512355aae5b61553de7a6332d38e9a156 Mon Sep 17 00:00:00 2001
From: PauloftheWest <paulofthewest@google.com>
Date: Sun, 24 Aug 2014 11:10:16 -0700
Subject: [PATCH] Material design updates for Bluetooth Settings dialog.

Bug: 17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
---
 res/layout/bluetooth_device_settings.xml      |  3 ++-
 res/layout/bluetooth_preference_category.xml  | 25 +++++++++++++++++++
 .../bluetooth/DeviceProfilesSettings.java     |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/bluetooth_preference_category.xml

diff --git a/res/layout/bluetooth_device_settings.xml b/res/layout/bluetooth_device_settings.xml
index cc2cc09d144..b87551a5b3e 100644
--- a/res/layout/bluetooth_device_settings.xml
+++ b/res/layout/bluetooth_device_settings.xml
@@ -31,8 +31,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/bluetooth_preference_paired_dialog_name_label"
+                    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:textDirection="locale"
-                    android:textColor="?android:attr/colorAccent"
                     style="@style/bt_item_label" />
 
             <EditText android:id="@+id/name"
diff --git a/res/layout/bluetooth_preference_category.xml b/res/layout/bluetooth_preference_category.xml
new file mode 100644
index 00000000000..59a3e872695
--- /dev/null
+++ b/res/layout/bluetooth_preference_category.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<!-- Layout used for Bluetooth PreferenceCategory in a DeviceProfilesSettings. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="@android:style/TextAppearance.Material.Body1"
+    android:textColor="?android:attr/textColorSecondary"
+    android:paddingTop="16dip"
+    android:paddingBottom="16dip" />
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 64c807fe760..110432bdd1e 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -78,6 +78,7 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
         addPreferencesFromResource(R.xml.bluetooth_device_advanced);
         getPreferenceScreen().setOrderingAsAdded(false);
         mProfileContainer = (PreferenceGroup) findPreference(KEY_PROFILE_CONTAINER);
+        mProfileContainer.setLayoutResource(R.layout.bluetooth_preference_category);
 
         mManager = LocalBluetoothManager.getInstance(getActivity());
         CachedBluetoothDeviceManager deviceManager =