Merge "remove pixelflinger from healthd" (cb0bb7c5) · Commits · e / os / android_system_core

charger/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)

		LOCAL_C_INCLUDES := bootable/recovery

		LOCAL_STATIC_LIBRARIES := libminui libpixelflinger_static libpng
		LOCAL_STATIC_LIBRARIES := libminui libpng
		ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)
		LOCAL_STATIC_LIBRARIES += libsuspend
		endif

charger/charger.c

+21 −21

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ struct power_supply {
		};

		struct frame {
		const char *name;
		int disp_time;
		int min_capacity;
		bool level_only;
		@@ -142,33 +141,27 @@ struct uevent {

		static struct frame batt_anim_frames[] = {
		{
		.name = "charger/battery_0",
		.disp_time = 750,
		.min_capacity = 0,
		},
		{
		.name = "charger/battery_1",
		.disp_time = 750,
		.min_capacity = 20,
		},
		{
		.name = "charger/battery_2",
		.disp_time = 750,
		.min_capacity = 40,
		},
		{
		.name = "charger/battery_3",
		.disp_time = 750,
		.min_capacity = 60,
		},
		{
		.name = "charger/battery_4",
		.disp_time = 750,
		.min_capacity = 80,
		.level_only = true,
		},
		{
		.name = "charger/battery_5",
		.disp_time = 750,
		.min_capacity = BATTERY_FULL_THRESH,
		},
		@@ -198,8 +191,8 @@ static int64_t curr_time_ms(void)
		static void clear_screen(void)
		{
		gr_color(0, 0, 0, 255);
		gr_fill(0, 0, gr_fb_width(), gr_fb_height());
		};
		gr_clear();
		}

		#define MAX_KLOG_WRITE_BUF_SZ 256

		@@ -659,8 +652,8 @@ static void draw_battery(struct charger *charger)

		if (batt_anim->num_frames != 0) {
		draw_surface_centered(charger, frame->surface);
		LOGV("drawing frame #%d name=%s min_cap=%d time=%d\n",
		batt_anim->cur_frame, frame->name, frame->min_capacity,
		LOGV("drawing frame #%d min_cap=%d time=%d\n",
		batt_anim->cur_frame, frame->min_capacity,
		frame->disp_time);
		}
		}
		@@ -982,20 +975,27 @@ int main(int argc, char **argv)

		ret = res_create_surface("charger/battery_fail", &charger->surf_unknown);
		if (ret < 0) {
		LOGE("Cannot load image\n");
		LOGE("Cannot load battery_fail image\n");
		charger->surf_unknown = NULL;
		}

		for (i = 0; i < charger->batt_anim->num_frames; i++) {
		struct frame *frame = &charger->batt_anim->frames[i];
		charger->batt_anim = &battery_animation;

		ret = res_create_surface(frame->name, &frame->surface);
		gr_surface* scale_frames;
		int scale_count;
		ret = res_create_multi_surface("charger/battery_scale", &scale_count, &scale_frames);
		if (ret < 0) {
		LOGE("Cannot load image %s\n", frame->name);
		/* TODO: free the already allocated surfaces... */
		LOGE("Cannot load battery_scale image\n");
		charger->batt_anim->num_frames = 0;
		charger->batt_anim->num_cycles = 1;
		break;
		} else if (scale_count != charger->batt_anim->num_frames) {
		LOGE("battery_scale image has unexpected frame count (%d, expected %d)\n",
		scale_count, charger->batt_anim->num_frames);
		charger->batt_anim->num_frames = 0;
		charger->batt_anim->num_cycles = 1;
		} else {
		for (i = 0; i < charger->batt_anim->num_frames; i++) {
		charger->batt_anim->frames[i].surface = scale_frames[i];
		}
		}

charger/images/battery_0.png

deleted100644 → 0

−1.26 KiB

Loading image diff...

charger/images/battery_1.png

deleted100644 → 0

−1.26 KiB

Loading image diff...

charger/images/battery_2.png

deleted100644 → 0

−1.26 KiB

Loading image diff...