diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-15 12:15:00 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-15 12:15:00 -0700 |
| commit | bbc7ca24da2470619d5e4aa9e59435865d535d4f (patch) | |
| tree | 8d00fe12edae5611eab5b10375c529d848a421d0 /healthd | |
| parent | f7842079cd3df93dc22ff315d95414b2f92a4c18 (diff) | |
| parent | 6e9b28b2ea32cbff77581cf76af2486bef06e63b (diff) | |
| download | system_core-bbc7ca24da2470619d5e4aa9e59435865d535d4f.zip system_core-bbc7ca24da2470619d5e4aa9e59435865d535d4f.tar.gz system_core-bbc7ca24da2470619d5e4aa9e59435865d535d4f.tar.bz2 | |
resolved conflicts for merge of 6e9b28b2 to master
Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/healthd_mode_charger.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index 352510b..6800ad2 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -88,7 +88,7 @@ struct frame { int min_capacity; bool level_only; - gr_surface surface; + GRSurface* surface; }; struct animation { @@ -115,7 +115,7 @@ struct charger { struct key_state keys[KEY_MAX + 1]; struct animation *batt_anim; - gr_surface surf_unknown; + GRSurface* surf_unknown; int boot_min_cap; }; @@ -274,7 +274,7 @@ static void android_green(void) } /* returns the last y-offset of where the surface ends */ -static int draw_surface_centered(struct charger* /*charger*/, gr_surface surface) +static int draw_surface_centered(struct charger* /*charger*/, GRSurface* surface) { int w; int h; @@ -697,7 +697,7 @@ void healthd_mode_charger_init(struct healthd_config* config) charger->batt_anim = &battery_animation; - gr_surface* scale_frames; + GRSurface** scale_frames; int scale_count; ret = res_create_multi_display_surface("charger/battery_scale", &scale_count, &scale_frames); if (ret < 0) { |