From d866b8aa0341e960399c425b021b4a6aedfa5b9e Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 29 Mar 2017 15:30:44 -0400 Subject: [PATCH] Fix battery icon dark initialization Test: visual Change-Id: I333436dd0ffb4a7791a98caa53054d01e9ff18ef Fixes: 36443516 --- .../com/android/settingslib/graph/BatteryMeterDrawableBase.java | 2 +- .../SystemUI/src/com/android/systemui/BatteryMeterView.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java index 0f443d6791e3a..61ca13d2819a8 100755 --- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java @@ -63,7 +63,7 @@ public class BatteryMeterDrawableBase extends Drawable { mPlusPaint; private float mTextHeight, mWarningTextHeight; private int mIconTint = Color.WHITE; - private float mOldDarkIntensity = 0f; + private float mOldDarkIntensity = -1f; private int mHeight; private int mWidth; diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 8c1062bf4cf45..d57e88cce351e 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -98,6 +98,8 @@ public class BatteryMeterView extends LinearLayout implements addView(mBatteryIconView, mlp); updateShowPercent(); + // Init to not dark at all. + onDarkChanged(new Rect(), 0, DarkIconDispatcher.DEFAULT_ICON_TINT); } public void setForceShowPercent(boolean show) {