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" /> - 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 @@ - 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); } }