From a17a5b814f1c578df28cd5d444bd8abc3adbbba0 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Mon, 24 Sep 2012 20:33:51 -0700
Subject: [PATCH] Fix regression in Bluetooth settings.

Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
---
 res/xml/device_picker.xml                     |  2 +-
 res/xml/wifi_access_points.xml                |  2 +-
 .../bluetooth/BluetoothProgressCategory.java  | 29 +++++++++++++++++++
 .../settings/bluetooth/BluetoothSettings.java |  3 +-
 .../DeviceListPreferenceFragment.java         |  4 +--
 5 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 src/com/android/settings/bluetooth/BluetoothProgressCategory.java

diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
index 43b58296cd3..9fef34d84b2 100644
--- a/res/xml/device_picker.xml
+++ b/res/xml/device_picker.xml
@@ -21,7 +21,7 @@
         android:key="bt_scan"
         android:title="@string/bluetooth_preference_scan_title" />
 
-    <com.android.settings.ProgressCategory
+    <com.android.settings.bluetooth.BluetoothProgressCategory
         android:key="bt_device_list"
         android:title="@string/bluetooth_preference_found_devices"
         android:orderingFromXml="false" />
diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml
index 48104dd0387..7b8c92b1e6b 100644
--- a/res/xml/wifi_access_points.xml
+++ b/res/xml/wifi_access_points.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_settings_category">
 
-    <com.android.settings.ProgressCategory
+    <com.android.settings.bluetooth.BluetoothProgressCategory
             android:key="access_points"
             android:title="@string/wifi_access_points"
             android:persistent="false" />
diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
new file mode 100644
index 00000000000..1c813608a5f
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+package com.android.settings.bluetooth;
+
+import com.android.settings.ProgressCategory;
+import com.android.settings.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class BluetoothProgressCategory extends ProgressCategory {
+    public BluetoothProgressCategory(Context context, AttributeSet attrs) {
+        super(context, attrs, R.string.bluetooth_no_devices_found);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 0765d8f228b..e9ba39d4878 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -282,8 +282,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
 
                 // Available devices category
                 if (mAvailableDevicesCategory == null) {
-                    mAvailableDevicesCategory = new ProgressCategory(getActivity(), null,
-                            R.string.bluetooth_no_devices_found);
+                    mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null);
                 } else {
                     mAvailableDevicesCategory.removeAll();
                 }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 90f8de5e3df..7fc1b65de01 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -193,8 +193,8 @@ public abstract class DeviceListPreferenceFragment extends
     }
 
     private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof ProgressCategory) {
-            ((ProgressCategory) mDeviceListGroup).setProgress(start);
+        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
+            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
         }
     }