| commit | 17e605aae8e00c2863a1ce71a158c13223cd2795 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Mon Apr 03 18:01:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 03 18:01:17 2017 +0000 |
| tree | e26a8d2eb6833654ac64fb1bfa125f01679ba242 | |
| parent | 834752d4b266b2f1f11df7a82e9ab177bea8ee21 [diff] | |
| parent | cb4ed821f22de0309cdf0ae357aa56584ab2f5a1 [diff] |
Merge "Fix battery icon dark initialization" into oc-dev am: cb4ed821f2 Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290
diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java index 0f443d6..61ca13d 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 @@ 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 8c1062b..d57e88c 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -98,6 +98,8 @@ addView(mBatteryIconView, mlp); updateShowPercent(); + // Init to not dark at all. + onDarkChanged(new Rect(), 0, DarkIconDispatcher.DEFAULT_ICON_TINT); } public void setForceShowPercent(boolean show) {