diff options
author | Fabian Kozynski <kozynski@google.com> | 2019-04-15 16:35:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-15 16:35:10 +0000 |
commit | c34f078f61ab2f16e7335fef4de33c75ecf3dd51 (patch) | |
tree | 7525626850870ebe9c35b84832cc02db3e78efcf /packages/SystemUI/src | |
parent | 4bea465dbb5f1613ab0a3c331c6b78c647e47894 (diff) | |
parent | 7c35d3396aa348252667309af8333b3346bee499 (diff) |
Merge "Fix tinting of battery percentage" into qt-dev
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 2 |
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 7985dfc75ad4..6c1d1f91830f 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -401,10 +401,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( |