diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-02 20:09:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 20:09:17 +0000 |
| commit | 1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f (patch) | |
| tree | 60dc424b4904971c2afd61c33359e7409222f83f /src/com/android/settings/bluetooth | |
| parent | 6a6ae2dc8401eafdb1710c97c4b07aa53c797ba1 (diff) | |
| parent | f2819e0eada8af3835141857b5d499bca90774a6 (diff) | |
| download | packages_apps_Settings-1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f.zip packages_apps_Settings-1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f.tar.gz packages_apps_Settings-1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f.tar.bz2 | |
Merge "Fix battery usage screen issues" into mnc-dev
Diffstat (limited to 'src/com/android/settings/bluetooth')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothDevicePreference.java | 4 | ||||
| -rwxr-xr-x | src/com/android/settings/bluetooth/BluetoothSettings.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 7bdc1a6..b36d2ea 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -222,7 +222,7 @@ public final class BluetoothDevicePreference extends Preference implements data.className = BluetoothSettings.class.getName(); data.title = mCachedDevice.getName(); data.screenTitle = context.getResources().getString(R.string.bluetooth_settings); - data.iconResId = R.drawable.ic_settings_bluetooth2; + data.iconResId = R.drawable.ic_settings_bluetooth; data.enabled = true; Index.getInstance(context).updateFromSearchIndexableData(data); @@ -268,6 +268,6 @@ public final class BluetoothDevicePreference extends Preference implements return R.drawable.ic_bt_headset_hfp; } } - return R.drawable.ic_settings_bluetooth2; + return R.drawable.ic_settings_bluetooth; } } diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index cf06fe7..4113b9e 100755 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -488,7 +488,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem com.android.settings.bluetooth.Utils.updateSearchIndex(activity, BluetoothSettings.class.getName(), device.getName(), context.getResources().getString(R.string.bluetooth_settings), - R.drawable.ic_settings_bluetooth2, false); + R.drawable.ic_settings_bluetooth, false); } }); |