Always show the battery percentage unless it is unknown

am: 3f0250c3cc

Change-Id: If5027f2fc94aaf1f2db1d6df79866185e2cfe86d
This commit is contained in:
Damien Bargiacchi 2016-11-29 19:10:58 +00:00 committed by android-build-merger
commit fdce0878f1
1 changed files with 7 additions and 2 deletions

View File

@ -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);