summaryrefslogtreecommitdiffstats
path: root/healthd
diff options
context:
space:
mode:
authorDamien Bargiacchi <drb@google.com>2016-08-24 20:45:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-24 20:45:17 +0000
commitada99f91b05134bb2fa2547f9d4bf94ac5688239 (patch)
treeae755e798f1da5bab27833a56ba8c37a87424aae /healthd
parente5bda4d0ec6cf32dfefb777d1b537984871a8056 (diff)
parent0ee524de689e27379eaa3d0af0152183b844b0e8 (diff)
downloadsystem_core-ada99f91b05134bb2fa2547f9d4bf94ac5688239.tar.gz
system_core-ada99f91b05134bb2fa2547f9d4bf94ac5688239.tar.bz2
system_core-ada99f91b05134bb2fa2547f9d4bf94ac5688239.zip
Update to new minui text API
am: 0ee524de68 Change-Id: I19341d2639b6efeb13eddaae1083252eeafc77fc
Diffstat (limited to 'healthd')
-rw-r--r--healthd/healthd_mode_charger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 612885bc7..857bcb28c 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -257,13 +257,13 @@ static int request_suspend(bool /*enable*/)
static int draw_text(const char *str, int x, int y)
{
- int str_len_px = gr_measure(str);
+ int str_len_px = gr_measure(gr_sys_font(), str);
if (x < 0)
x = (gr_fb_width() - str_len_px) / 2;
if (y < 0)
y = (gr_fb_height() - char_height) / 2;
- gr_text(x, y, str, 0);
+ gr_text(gr_sys_font(), x, y, str, 0);
return y + char_height;
}
@@ -364,7 +364,7 @@ static void update_screen_state(struct charger *charger, int64_t now)
}
gr_init();
- gr_font_size(&char_width, &char_height);
+ gr_font_size(gr_sys_font(), &char_width, &char_height);
#ifndef CHARGER_DISABLE_INIT_BLANK
gr_fb_blank(true);