From 706d9684afb4d46541521d290aa99c08531a5f4c Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 30 May 2017 15:03:29 -0400
Subject: [PATCH] Status bar size tweaks

++1dp for Data saver and Hotspot
--1dp for Total silence
>>1dp for Battery lightning bolt

Also implemented keyword "powersave" for `dispatchDemoCommand()` in
BatteryControllerImpl

Test: visual
Bug: 37013523
Change-Id: I027fd18aadeef5c49826c37db9f681c14175a3aa
---
 .../graph/BatteryMeterDrawableBase.java       | 11 +++++-----
 packages/SystemUI/docs/demo_mode.md           |  1 +
 .../res/drawable/stat_sys_data_saver.xml      |  4 ++--
 .../drawable/stat_sys_dnd_total_silence.xml   |  4 ++--
 .../res/drawable/stat_sys_hotspot.xml         |  4 ++--
 .../policy/BatteryControllerImpl.java         | 21 ++++++++++++-------
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
index 83aa25aca3594..1bb1417067364 100755
--- a/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
+++ b/packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java
@@ -40,7 +40,7 @@ public class BatteryMeterDrawableBase extends Drawable {
 
     private static final float ASPECT_RATIO = .58f;
     public static final String TAG = BatteryMeterDrawableBase.class.getSimpleName();
-    private static final float RADIUS_RATIO = 1.75f / 17f;
+    private static final float RADIUS_RATIO = 1.0f / 17f;
 
     protected final Context mContext;
     protected final Paint mFramePaint;
@@ -273,9 +273,9 @@ public class BatteryMeterDrawableBase extends Drawable {
 
         // button-frame: area above the battery body
         mButtonFrame.set(
-                mFrame.left + Math.round(width * 0.3f),
+                mFrame.left + Math.round(width * 0.28f),
                 mFrame.top,
-                mFrame.right - Math.round(width * 0.3f),
+                mFrame.right - Math.round(width * 0.28f),
                 mFrame.top + buttonHeight);
 
         // frame: battery body area
@@ -302,9 +302,10 @@ public class BatteryMeterDrawableBase extends Drawable {
 
         if (mCharging) {
             // define the bolt shape
-            final float bl = mFrame.left + mFrame.width() / 4f;
+            // Shift right by 1px for maximal bolt-goodness
+            final float bl = mFrame.left + mFrame.width() / 4f + 1;
             final float bt = mFrame.top + mFrame.height() / 6f;
-            final float br = mFrame.right - mFrame.width() / 4f;
+            final float br = mFrame.right - mFrame.width() / 4f + 1;
             final float bb = mFrame.bottom - mFrame.height() / 10f;
             if (mBoltFrame.left != bl || mBoltFrame.top != bt
                     || mBoltFrame.right != br || mBoltFrame.bottom != bb) {
diff --git a/packages/SystemUI/docs/demo_mode.md b/packages/SystemUI/docs/demo_mode.md
index 258c76b85ee7c..6cf7060c794c9 100644
--- a/packages/SystemUI/docs/demo_mode.md
+++ b/packages/SystemUI/docs/demo_mode.md
@@ -29,6 +29,7 @@ Command              | Subcommand                 | Argument       | Description
 ```battery```        |                            |                | Control the battery display
                      | ```level```                |                | Sets the battery level (0 - 100)
                      | ```plugged```              |                | Sets charging state (```true```, ```false```)
+                     | ```powersave```            |                | Sets power save mode (```true```, ```anything else```)
 ```network```        |                            |                | Control the RSSI display
                      | ```airplane```             |                | ```show``` to show icon, any other value to hide
                      | ```fully```                |                | Sets MCS state to fully connected (```true```, ```false```)
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_saver.xml b/packages/SystemUI/res/drawable/stat_sys_data_saver.xml
index 366dbb5a55a5e..fed7caec377a3 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_saver.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_saver.xml
@@ -20,8 +20,8 @@
     android:insetLeft="2.5dp"
     android:insetRight="2.5dp" >
     <vector
-        android:width="17dp"
-        android:height="17dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="19.0"
         android:viewportHeight="19.0">
         <group
diff --git a/packages/SystemUI/res/drawable/stat_sys_dnd_total_silence.xml b/packages/SystemUI/res/drawable/stat_sys_dnd_total_silence.xml
index 41ed754bb2f13..11a3bddaf1df6 100644
--- a/packages/SystemUI/res/drawable/stat_sys_dnd_total_silence.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_dnd_total_silence.xml
@@ -20,8 +20,8 @@
     android:insetLeft="2.5dp"
     android:insetRight="2.5dp" >
     <vector
-        android:width="17dp"
-        android:height="17dp"
+        android:width="16dp"
+        android:height="16dp"
         android:viewportWidth="16.6"
         android:viewportHeight="16.6">
         <group
diff --git a/packages/SystemUI/res/drawable/stat_sys_hotspot.xml b/packages/SystemUI/res/drawable/stat_sys_hotspot.xml
index 5dcf5c80c10a1..4f52777339c59 100644
--- a/packages/SystemUI/res/drawable/stat_sys_hotspot.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_hotspot.xml
@@ -17,8 +17,8 @@ Copyright (C) 2017 The Android Open Source Project
     android:insetLeft="2.5dp"
     android:insetRight="2.5dp">
     <vector
-        android:width="17.0dp"
-        android:height="17.0dp"
+        android:width="18.0dp"
+        android:height="18.0dp"
         android:viewportWidth="18.0"
         android:viewportHeight="18.0">
       <group
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
index fc86ac332c826..e8d5af6121ed7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java
@@ -207,14 +207,19 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
             registerReceiver();
             updatePowerSave();
         } else if (mDemoMode && command.equals(COMMAND_BATTERY)) {
-           String level = args.getString("level");
-           String plugged = args.getString("plugged");
-           if (level != null) {
-               mLevel = Math.min(Math.max(Integer.parseInt(level), 0), 100);
-           }
-           if (plugged != null) {
-               mPluggedIn = Boolean.parseBoolean(plugged);
-           }
+            String level = args.getString("level");
+            String plugged = args.getString("plugged");
+            String powerSave = args.getString("powersave");
+            if (level != null) {
+                mLevel = Math.min(Math.max(Integer.parseInt(level), 0), 100);
+            }
+            if (plugged != null) {
+                mPluggedIn = Boolean.parseBoolean(plugged);
+            }
+            if (powerSave != null) {
+                mPowerSave = powerSave.equals("true");
+                firePowerSaveChanged();
+            }
             fireBatteryLevelChanged();
         }
     }