Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the bt background color." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-26 20:21:50 +00:00
committed by Android (Google) Code Review
parent 87794e95a2 b4f8a0be8d
commit 4a324cb196
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java
View File

@@ -73,7 +73,7 @@ public class BluetoothDeviceLayerDrawable extends LayerDrawable {
final Drawable deviceDrawable = context.getDrawable(resId); final Drawable deviceDrawable = context.getDrawable(resId);
final BatteryMeterDrawable batteryDrawable = new BatteryMeterDrawable(context, final BatteryMeterDrawable batteryDrawable = new BatteryMeterDrawable(context,
R.color.meter_background_color, batteryLevel); context.getColor(R.color.meter_background_color), batteryLevel);
final int pad = context.getResources().getDimensionPixelSize(R.dimen.bt_battery_padding); final int pad = context.getResources().getDimensionPixelSize(R.dimen.bt_battery_padding);
batteryDrawable.setPadding(pad, pad, pad, pad); batteryDrawable.setPadding(pad, pad, pad, pad);
@@ -107,6 +107,8 @@ public class BluetoothDeviceLayerDrawable extends LayerDrawable {
@VisibleForTesting @VisibleForTesting
static class BatteryMeterDrawable extends BatteryMeterDrawableBase { static class BatteryMeterDrawable extends BatteryMeterDrawableBase {
private final float mAspectRatio; private final float mAspectRatio;
@VisibleForTesting
int mFrameColor;
public BatteryMeterDrawable(Context context, int frameColor, int batteryLevel) { public BatteryMeterDrawable(Context context, int frameColor, int batteryLevel) {
super(context, frameColor); super(context, frameColor);
@@ -118,6 +120,7 @@ public class BluetoothDeviceLayerDrawable extends LayerDrawable {
final int tintColor = Utils.getColorAttr(context, android.R.attr.colorControlNormal); final int tintColor = Utils.getColorAttr(context, android.R.attr.colorControlNormal);
setColorFilter(new PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_IN)); setColorFilter(new PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_IN));
setBatteryLevel(batteryLevel); setBatteryLevel(batteryLevel);
mFrameColor = frameColor;
} }
@Override @Override

11
packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java
View File

@@ -100,4 +100,15 @@ public class BluetoothDeviceLayerDrawableTest {
assertThat(twinDrawable.getLayerInsetTop(1)).isEqualTo( assertThat(twinDrawable.getLayerInsetTop(1)).isEqualTo(
drawable.getLayerInsetTop(1)); drawable.getLayerInsetTop(1));
} }
@Test
public void testCreateLayerDrawable_bluetoothDrawable_hasCorrectFrameColor() {
BluetoothDeviceLayerDrawable drawable = BluetoothDeviceLayerDrawable.createLayerDrawable(
mContext, RES_ID, BATTERY_LEVEL);
BluetoothDeviceLayerDrawable.BatteryMeterDrawable batteryMeterDrawable =
(BluetoothDeviceLayerDrawable.BatteryMeterDrawable) drawable.getDrawable(1);
assertThat(batteryMeterDrawable.mFrameColor).isEqualTo(
mContext.getColor(R.color.meter_background_color));
}
} }