commit 4f7c0843bbaa9cb4ec3a7890461cebbee689530a
author Dmitry Shmidt <dimitrysh@google.com> Tue Nov 01 17:12:02 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 01 17:12:02 2011 -0700
tree c164c092c550415e2ee1799d5bfece680797e404
parent 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4
parent d99fe5ec960b5eae96585d5ceb59fe287fe0c5e7

Merge "libnl_2: Fix memory leaks" into ics-mr0

charger/charger.c

diff --git a/charger/charger.c b/charger/charger.c
index 03280bf..abf5517 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -87,6 +87,7 @@
     const char *name;
     int disp_time;
     int min_capacity;
+    bool level_only;
 
     gr_surface surface;
 };
@@ -157,6 +158,7 @@
         .name = "charger/battery_4",
         .disp_time = 750,
         .min_capacity = 80,
+        .level_only = true,
     },
     {
         .name = "charger/battery_5",
@@ -735,7 +737,14 @@
      * if necessary, advance cycle cntr, and reset frame cntr
      */
     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_frame = 0;