am 41904c99: am fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev

* commit '41904c99c2cf9184eadccff2183b8682f844faf6':
  Fix status bar bt accessibility message
This commit is contained in:
Jason Monk
2015-07-14 20:42:46 +00:00
committed by Android Git Automerger

View File

@@ -275,7 +275,7 @@ public class PhoneStatusBarPolicy {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
int iconId = R.drawable.stat_sys_data_bluetooth; int iconId = R.drawable.stat_sys_data_bluetooth;
String contentDescription = String contentDescription =
mContext.getString(R.string.accessibility_bluetooth_disconnected); mContext.getString(R.string.accessibility_quick_settings_bluetooth_on);
if (adapter != null) { if (adapter != null) {
mBluetoothEnabled = (adapter.getState() == BluetoothAdapter.STATE_ON); mBluetoothEnabled = (adapter.getState() == BluetoothAdapter.STATE_ON);
if (adapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED) { if (adapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED) {