commit d855664e7ba29a5f8431038b280cc2d8d4a9eb50
author Damien Bargiacchi <drb@google.com> Tue Oct 25 01:33:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 01:33:50 2016 +0000
tree 294d639db05a0226fc2dd0d82b84aade1fb8ca98
parent 90e4a4e6904629fbc9a3718d8acfd2e8d1c274e2
parent e62ed2a097755129ab3bca5e646b263518f7aa2f

Always show the battery percentage unless it is unknown
am: 3f0250c3cc

Change-Id: I6e759572904fb7f505528812266fc48ecc8afd49

healthd/healthd_mode_charger.cpp

diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 6551cc7..ccf948b 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -341,14 +341,19 @@
 
 static void draw_percent(const animation& anim)
 {
-    if (anim.cur_level <= 0 || anim.cur_status != BATTERY_STATUS_CHARGING) return;
+    int cur_level = anim.cur_level;
+    if (anim.cur_status == BATTERY_STATUS_FULL) {
+        cur_level = 100;
+    }
+
+    if (cur_level <= 0) return;
 
     const animation::text_field& field = anim.text_percent;
     if (field.font == nullptr || field.font->char_width == 0 || field.font->char_height == 0) {
         return;
     }
 
-    std::string str = base::StringPrintf("%d%%", anim.cur_level);
+    std::string str = base::StringPrintf("%d%%", cur_level);
 
     int x, y;
     determine_xy(field, str.size(), &x, &y);