From 3f0250c3cc84b2480ef70d51343204eecbe84532 Mon Sep 17 00:00:00 2001 From: Damien Bargiacchi Date: Mon, 24 Oct 2016 16:45:29 -0700 Subject: [PATCH] Always show the battery percentage unless it is unknown Bug: 29547343 Change-Id: I55630be8033cd8074628a892960b5fafe0c83338 --- healthd/healthd_mode_charger.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index fb17f2da1..b2570448f 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -341,14 +341,19 @@ static void draw_clock(const animation& anim) 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);