openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of 6e9b28b2 to master 

Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf
This commit is contained in:
Elliott Hughes 2015-04-15 12:15:00 -07:00
parent f7842079cd 6e9b28b2ea
commit bbc7ca24da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
healthd/healthd_mode_charger.cpp
View File

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