diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-15 18:22:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 18:22:25 +0000 |
| commit | 6e9b28b2ea32cbff77581cf76af2486bef06e63b (patch) | |
| tree | ef358b732c14353f80221004043126ea930b0146 /healthd | |
| parent | 687dae83da7da2a0efe8263281f9ba898a610a41 (diff) | |
| parent | fae77740c29b732e82b73a043f596470cd0ac0ed (diff) | |
| download | system_core-6e9b28b2ea32cbff77581cf76af2486bef06e63b.zip system_core-6e9b28b2ea32cbff77581cf76af2486bef06e63b.tar.gz system_core-6e9b28b2ea32cbff77581cf76af2486bef06e63b.tar.bz2 | |
am fae77740: am f65d9756: Merge "Move away from gr_surface."
* commit 'fae77740c29b732e82b73a043f596470cd0ac0ed':
Move away from gr_surface.
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 9ed5944..78f8403 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; }; static struct frame batt_anim_frames[] = { @@ -273,7 +273,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; @@ -681,7 +681,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) { |