Merge cherrypicks of [2828380, 2830382, 2830383, 2830273, 2830093, 2830593] into oc-mr1-release (d0d87383) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -184,7 +184,11 @@ public class QSDetailItems extends FrameLayout {
	}		}
	view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE);		view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE);
	final ImageView iv = (ImageView) view.findViewById(android.R.id.icon);		final ImageView iv = (ImageView) view.findViewById(android.R.id.icon);
			if (item.iconDrawable != null) {
			iv.setImageDrawable(item.iconDrawable);
			} else {
	iv.setImageResource(item.icon);		iv.setImageResource(item.icon);
			}
	iv.getOverlay().clear();		iv.getOverlay().clear();
	if (item.overlay != null) {		if (item.overlay != null) {
	item.overlay.setBounds(0, 0, mQsDetailIconOverlaySize, mQsDetailIconOverlaySize);		item.overlay.setBounds(0, 0, mQsDetailIconOverlaySize, mQsDetailIconOverlaySize);
	@@ -254,6 +258,7 @@ public class QSDetailItems extends FrameLayout {

	public static class Item {		public static class Item {
	public int icon;		public int icon;
			public Drawable iconDrawable;
	public Drawable overlay;		public Drawable overlay;
	public CharSequence line1;		public CharSequence line1;
	public CharSequence line2;		public CharSequence line2;

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

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package com.android.systemui.qs.tiles;		package com.android.systemui.qs.tiles;

			import static com.android.settingslib.graph.BluetoothDeviceLayerDrawable.createLayerDrawable;

	import android.bluetooth.BluetoothAdapter;		import android.bluetooth.BluetoothAdapter;
	import android.bluetooth.BluetoothDevice;		import android.bluetooth.BluetoothDevice;
	import android.bluetooth.BluetoothProfile;		import android.bluetooth.BluetoothProfile;
	@@ -32,8 +34,10 @@ import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.settingslib.Utils;		import com.android.settingslib.Utils;
	import com.android.settingslib.bluetooth.CachedBluetoothDevice;		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
			import com.android.settingslib.graph.BluetoothDeviceLayerDrawable;
	import com.android.systemui.Dependency;		import com.android.systemui.Dependency;
	import com.android.systemui.R;		import com.android.systemui.R;
			import com.android.systemui.R.drawable;
	import com.android.systemui.plugins.ActivityStarter;		import com.android.systemui.plugins.ActivityStarter;
	import com.android.systemui.plugins.qs.DetailAdapter;		import com.android.systemui.plugins.qs.DetailAdapter;
	import com.android.systemui.plugins.qs.QSTile.BooleanState;		import com.android.systemui.plugins.qs.QSTile.BooleanState;
	@@ -127,6 +131,15 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {
	if (connected) {		if (connected) {
	state.icon = ResourceIcon.get(R.drawable.ic_qs_bluetooth_connected);		state.icon = ResourceIcon.get(R.drawable.ic_qs_bluetooth_connected);
	state.label = mController.getLastDeviceName();		state.label = mController.getLastDeviceName();
			CachedBluetoothDevice lastDevice = mController.getLastDevice();
			if (lastDevice != null) {
			int batteryLevel = lastDevice.getBatteryLevel();
			if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {
			BluetoothDeviceLayerDrawable drawable = createLayerDrawable(mContext,
			R.drawable.ic_qs_bluetooth_connected, batteryLevel);
			state.icon = new DrawableIcon(drawable);
			}
			}
	state.contentDescription = mContext.getString(		state.contentDescription = mContext.getString(
	R.string.accessibility_bluetooth_name, state.label);		R.string.accessibility_bluetooth_name, state.label);
	} else if (state.isTransient) {		} else if (state.isTransient) {
	@@ -278,6 +291,8 @@ public class BluetoothTile extends QSTileImpl<BooleanState> {
	item.icon = R.drawable.ic_qs_bluetooth_connected;		item.icon = R.drawable.ic_qs_bluetooth_connected;
	int batteryLevel = device.getBatteryLevel();		int batteryLevel = device.getBatteryLevel();
	if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {		if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {
			item.iconDrawable = createLayerDrawable(mContext, item.icon,
			batteryLevel);
	item.line2 = mContext.getString(		item.line2 = mContext.getString(
	R.string.quick_settings_connected_battery_level,		R.string.quick_settings_connected_battery_level,
	Utils.formatPercentage(batteryLevel));		Utils.formatPercentage(batteryLevel));

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@ public interface BluetoothController extends CallbackController<Callback>, Dumpa

	int getMaxConnectionState(CachedBluetoothDevice device);		int getMaxConnectionState(CachedBluetoothDevice device);
	int getBondState(CachedBluetoothDevice device);		int getBondState(CachedBluetoothDevice device);
			CachedBluetoothDevice getLastDevice();

	public interface Callback {		public interface Callback {
	void onBluetoothStateChange(boolean enabled);		void onBluetoothStateChange(boolean enabled);

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,11 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa
	return getCachedState(device).mBondState;		return getCachedState(device).mBondState;
	}		}

			@Override
			public CachedBluetoothDevice getLastDevice() {
			return mLastDevice;
			}

	@Override		@Override
	public int getMaxConnectionState(CachedBluetoothDevice device) {		public int getMaxConnectionState(CachedBluetoothDevice device) {
	return getCachedState(device).mMaxConnectionState;		return getCachedState(device).mMaxConnectionState;

packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeBluetoothController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -93,4 +93,9 @@ public class FakeBluetoothController extends BaseLeakChecker<Callback> implement
	public int getBondState(CachedBluetoothDevice device) {		public int getBondState(CachedBluetoothDevice device) {
	return 0;		return 0;
	}		}

			@Override
			public CachedBluetoothDevice getLastDevice() {
			return null;
			}
	}		}