SysUI: Fix coloring of battery drawables

The frame color is now correctly tinted based on background color
set by setDarkIntensity()

Battery bolt and percentage text have their alpha set to full opacity
to increase visibility when drawn on a light colored status bar.

Change-Id: I907101ed1465f99b92370332d4839b7f0aad13b2

Author: 0xD34D

packages/SystemUI/res/drawable/ic_battery_circle_frame.xml

@@ -20,9 +20,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+    <!-- Path will be tinted based on dual tone color -->
     <path
         android:name="frame"
-        android:strokeColor="@color/batterymeter_frame_color"
+        android:strokeColor="#000000"
         android:strokeLineJoin="round"
         android:strokeWidth="3"
         android:pathData="@string/battery_circle_path"/>

packages/SystemUI/res/drawable/ic_battery_landscape_frame.xml

@@ -24,8 +24,9 @@
         android:name="mask"
         android:pathData="@string/battery_landscape_clip_path" />
 
+    <!-- Path will be tinted based on dual tone color -->
     <path
         android:name="frame"
-        android:fillColor="@color/batterymeter_frame_color"
+        android:fillColor="#000000"
         android:pathData="M 1 4 H 25 V 20 H 1 V 4 Z" />
 </vector>

packages/SystemUI/res/drawable/ic_battery_portrait_frame.xml

@@ -24,9 +24,10 @@
         android:name="mask"
         android:pathData="@string/battery_portrait_clip_path" />
 
+    <!-- Path will be tinted based on dual tone color -->
     <path
         android:name="frame"
-        android:fillColor="@color/batterymeter_frame_color"
+        android:fillColor="#000000"
         android:pathData="M19,2v19H5V2H19z" />
 
 </vector>

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

@@ -537,7 +537,9 @@ public void onDispose() {
         @Override
         public void setDarkIntensity(int backgroundColor, int fillColor) {
             mIconTint = fillColor;
-            mBoltDrawable.setTint(fillColor);
+            // make bolt drawable tint fully opaque so it stands out
+            mBoltDrawable.setTint(0xff000000 | fillColor);
+            mFrameDrawable.setTint(backgroundColor);
             updateBoltDrawableLayer(mBatteryDrawable, mBoltDrawable);
             invalidate();
         }
@@ -660,7 +662,8 @@ private void drawPercentageText(Canvas canvas, BatteryTracker tracker) {
                     && (mShowPercent && !(level == 100 && !SHOW_100_PERCENT))) {
                 // draw the percentage text
                 String pctText = String.valueOf(SINGLE_DIGIT_PERCENT ? (level/10) : level);
-                mTextAndBoltPaint.setColor(getColorForLevel(level));
+                // make paint color fully opaque so text stands out better
+                mTextAndBoltPaint.setColor(0xff000000 | getColorForLevel(level));
                 canvas.drawText(pctText, mTextX, mTextY, mTextAndBoltPaint);
             } else if (level <= mCriticalLevel) {
                 // draw the warning text