Skip to content
Snippets Groups Projects
Commit 08ffd07a authored by The Android Automerger's avatar The Android Automerger
Browse files

Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"

This reverts commit 6fb3df8d, reversing
changes made to d4f29767.
parent 86eeea5c
Branches
Tags
No related merge requests found
...@@ -87,7 +87,6 @@ struct frame { ...@@ -87,7 +87,6 @@ struct frame {
const char *name; const char *name;
int disp_time; int disp_time;
int min_capacity; int min_capacity;
bool level_only;
gr_surface surface; gr_surface surface;
}; };
...@@ -158,7 +157,6 @@ static struct frame batt_anim_frames[] = { ...@@ -158,7 +157,6 @@ static struct frame batt_anim_frames[] = {
.name = "charger/battery_4", .name = "charger/battery_4",
.disp_time = 750, .disp_time = 750,
.min_capacity = 80, .min_capacity = 80,
.level_only = true,
}, },
{ {
.name = "charger/battery_5", .name = "charger/battery_5",
...@@ -737,14 +735,7 @@ static void update_screen_state(struct charger *charger, int64_t now) ...@@ -737,14 +735,7 @@ static void update_screen_state(struct charger *charger, int64_t now)
* if necessary, advance cycle cntr, and reset frame cntr * if necessary, advance cycle cntr, and reset frame cntr
*/ */
batt_anim->cur_frame++; batt_anim->cur_frame++;
if (batt_anim->cur_frame == batt_anim->num_frames) {
/* if the frame is used for level-only, that is only show it when it's
* the current level, skip it during the animation.
*/
while (batt_anim->cur_frame < batt_anim->num_frames &&
batt_anim->frames[batt_anim->cur_frame].level_only)
batt_anim->cur_frame++;
if (batt_anim->cur_frame >= batt_anim->num_frames) {
batt_anim->cur_cycle++; batt_anim->cur_cycle++;
batt_anim->cur_frame = 0; batt_anim->cur_frame = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment