From 7c35d3396aa348252667309af8333b3346bee499 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Fri, 12 Apr 2019 09:24:13 -0400
Subject: [PATCH] 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
---
 .../SystemUI/src/com/android/systemui/BatteryMeterView.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index 329b001a0a7cd..fdd1e10c65ad6 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(