Merge "QS BluetoothTile proiritizes connected device" into oc-dev (d5dfde89) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -259,24 +259,29 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {
	ArrayList<Item> items = new ArrayList<Item>();		ArrayList<Item> items = new ArrayList<Item>();
	final Collection<CachedBluetoothDevice> devices = mController.getDevices();		final Collection<CachedBluetoothDevice> devices = mController.getDevices();
	if (devices != null) {		if (devices != null) {
			int connectedDevices = 0;
	for (CachedBluetoothDevice device : devices) {		for (CachedBluetoothDevice device : devices) {
	if (device.getBondState() == BluetoothDevice.BOND_NONE) continue;		if (device.getBondState() == BluetoothDevice.BOND_NONE) continue;
	final Item item = new Item();		final Item item = new Item();
	item.icon = R.drawable.ic_qs_bluetooth_on;		item.icon = R.drawable.ic_qs_bluetooth_on;
	item.line1 = device.getName();		item.line1 = device.getName();
			item.tag = device;
	int state = device.getMaxConnectionState();		int state = device.getMaxConnectionState();
	if (state == BluetoothProfile.STATE_CONNECTED) {		if (state == BluetoothProfile.STATE_CONNECTED) {
	item.icon = R.drawable.ic_qs_bluetooth_connected;		item.icon = R.drawable.ic_qs_bluetooth_connected;
	item.line2 = mContext.getString(R.string.quick_settings_connected);		item.line2 = mContext.getString(R.string.quick_settings_connected);
	item.canDisconnect = true;		item.canDisconnect = true;
			items.add(connectedDevices, item);
			connectedDevices++;
	} else if (state == BluetoothProfile.STATE_CONNECTING) {		} else if (state == BluetoothProfile.STATE_CONNECTING) {
	item.icon = R.drawable.ic_qs_bluetooth_connecting;		item.icon = R.drawable.ic_qs_bluetooth_connecting;
	item.line2 = mContext.getString(R.string.quick_settings_connecting);		item.line2 = mContext.getString(R.string.quick_settings_connecting);
	}		items.add(connectedDevices, item);
	item.tag = device;		} else {
	items.add(item);		items.add(item);
	}		}
	}		}
			}
	mItems.setItems(items.toArray(new Item[items.size()]));		mItems.setItems(items.toArray(new Item[items.size()]));
	}		}