PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression in Bluetooth settings.

Browse Source 
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
This commit is contained in:
Jeff Brown
2012-09-24 20:33:51 -07:00
parent 8bea3c3fb8
commit a17a5b814f
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/device_picker.xml
View File

@@ -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" />

2
res/xml/wifi_access_points.xml
View File

@@ -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" />

29
src/com/android/settings/bluetooth/BluetoothProgressCategory.java Normal file
View File

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

3
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

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

4
src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
View File

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