commit 08ffd07a8867e13ea24989409a9e8aed9268c548
author The Android Automerger <android-build@android.com> Wed Nov 02 21:04:22 2011 -0700
committer The Android Automerger <android-build@android.com> Wed Nov 02 21:04:22 2011 -0700
tree 90d103d391e296c04ac1e927c3d9b00f0a4a858e
parent 86eeea5ce88cd551918810e007e33f434bec28f6

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

This reverts commit 6fb3df8d468a105b49c1cdbbdcb061dc8de022a4, reversing
changes made to d4f29767c8cd5a0d8b52b77bed117ca3746af8f3.

charger/charger.c

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