From e955df17cf8864676d3889cca79f936f88e353fb Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Tue, 27 Jun 2017 15:32:56 -0400 Subject: [PATCH] Set bolt and plus colors together Also test to make sure the colors stay the same. Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java Bug: 62668861 Change-Id: I7d01fd41aeedcb182dc05da8d7b0501a6b5b8539 --- .../graph/BatteryMeterDrawableBase.java | 1 + .../graph/BatteryMeterDrawableBaseTest.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java index 924a82f0b1f4a..426dc7c20a964 100755 --- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java @@ -281,6 +281,7 @@ public class BatteryMeterDrawableBase extends Drawable { mIconTint = fillColor; mFramePaint.setColor(backgroundColor); mBoltPaint.setColor(fillColor); + mPlusPaint.setColor(fillColor); mChargeColor = fillColor; invalidateSelf(); } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java index aa92fa40a91b6..01df0ecfdb11a 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import static com.google.common.truth.Truth.assertThat; +import static junit.framework.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyFloat; import static org.mockito.Matchers.anyString; @@ -101,4 +102,17 @@ public class BatteryMeterDrawableBaseTest { private boolean isRectZero(Rect r) { return r.left == 0 && r.top == 0 && r.right == 0 && r.bottom == 0; } + + @Test + public void testPlusPaint_isEqualToBoltPaint() { + // Before setting color + assertTrue(mBatteryDrawable.mPlusPaint.hasEqualAttributes(mBatteryDrawable.mBoltPaint)); + + final int fakeFillColor = 123; + final int fakeBackgrundColor = 456; + + // After + mBatteryDrawable.setColors(fakeFillColor, fakeBackgrundColor); + assertTrue(mBatteryDrawable.mPlusPaint.hasEqualAttributes(mBatteryDrawable.mBoltPaint)); + } }