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

Merge "Fix battery usage screen issues" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-02 20:09:16 +00:00
committed by Android (Google) Code Review
parent 6a6ae2dc84 f2819e0ead
commit 1b7bff11af
21 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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