summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
diff options
context:
space:
mode:
authorFabian Kozynski <kozynski@google.com>2019-04-12 09:24:13 -0400
committerFabian Kozynski <kozynski@google.com>2019-04-12 09:24:13 -0400
commit7c35d3396aa348252667309af8333b3346bee499 (patch)
tree294bc24aae5f3be473c0fc52d79f8b4e663e1479 /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
parenta0d2d2021daa3ddcd0ab6b52063f5d32bf06be77 (diff)
Fix tinting of battery percentage
The wallpaper aware tinting was being overwritten by the style. Changed order to fix. Fixes: 130408545 Test: manual, enabling and disabling percentage, also dark mode Change-Id: I551f335f34fb8e9c5894901041e9229ec181e1c6
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/BatteryMeterView.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/BatteryMeterView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index 329b001a0a7c..fdd1e10c65ad 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -405,10 +405,10 @@ public class BatteryMeterView extends LinearLayout implements
|| mShowPercentMode == MODE_ON || mShowPercentMode == MODE_ESTIMATE) {
if (!showing) {
mBatteryPercentView = loadPercentView();
- if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);
if (mPercentageStyleId != 0) { // Only set if specified as attribute
mBatteryPercentView.setTextAppearance(mPercentageStyleId);
}
+ if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);
updatePercentText();
addView(mBatteryPercentView,
new ViewGroup.LayoutParams(