diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-25 16:24:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 16:24:59 -0700 |
| commit | cd207ad437085fe3757259bd708fe74f68179094 (patch) | |
| tree | f05c2c8255d65cb119e7d62d280001396b096456 /res | |
| parent | 16398c9c973ba16a14455c4eee9ca162e0273792 (diff) | |
| parent | a17a5b814f1c578df28cd5d444bd8abc3adbbba0 (diff) | |
| download | packages_apps_settings-cd207ad437085fe3757259bd708fe74f68179094.zip packages_apps_settings-cd207ad437085fe3757259bd708fe74f68179094.tar.gz packages_apps_settings-cd207ad437085fe3757259bd708fe74f68179094.tar.bz2 | |
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/device_picker.xml | 2 | ||||
| -rw-r--r-- | res/xml/wifi_access_points.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml index 43b5829..9fef34d 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 48104dd..7b8c92b 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" /> |