commit 8ee2386925447a056b495988ed75697738b839b6
author Dan Pasanen <dan.pasanen@gmail.com> Tue Apr 04 13:02:36 2017 -0500
committer Dan Pasanen <dan.pasanen@gmail.com> Wed Apr 05 10:40:52 2017 -0500
tree a400053e5e58f20b9a4896316333a93ef0a4182e
parent 29f3b5775b76524421746820292aac4f70de49bc

charger: updates for 7.1.2 minui

Change-Id: I613799e7ed332d11333ba166f7df310b86deb450

charger/healthd_board_cm.cpp

diff --git a/charger/healthd_board_cm.cpp b/charger/healthd_board_cm.cpp
index 29168a1..1eabb5c 100644
--- a/charger/healthd_board_cm.cpp
+++ b/charger/healthd_board_cm.cpp
@@ -62,8 +62,6 @@
     .num_frames = 0,
 };
 
-static bool font_inited;
-
 static int draw_surface_centered(GRSurface* surface)
 {
     int w, h, x, y;
@@ -85,14 +83,14 @@
 
     struct frame *f = &anim.frames[0];
     int font_x, font_y;
-    gr_font_size(&font_x, &font_y);
-    int w = gr_measure(cap_str);
+    gr_font_size(gr_sys_font(), &font_x, &font_y);
+    int w = gr_measure(gr_sys_font(), cap_str);
     int h = gr_get_height(f->surface);
     int x = (gr_fb_width() - w) / 2;
     int y = (gr_fb_height() + h) / 2;
 
     gr_color(255, 255, 255, 255);
-    gr_text(x, y + font_y / 2, cap_str, 0);
+    gr_text(gr_sys_font(), x, y + font_y / 2, cap_str, 0);
 }
 
 #ifdef QCOM_HARDWARE
@@ -337,11 +335,6 @@
     int start_frame = 0;
     int capacity = -1;
 
-    if (!font_inited) {
-        gr_set_font("log");
-        font_inited = true;
-    }
-
     if (batt_prop && batt_prop->batteryLevel >= 0) {
         capacity = batt_prop->batteryLevel;
     }