Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd858e55 authored by Thomas Wendt's avatar Thomas Wendt
Browse files

Animate circle battery rotation back to 0 after unplugging 

After unplugging continue the rotation animation until it's back at 0
instead of jumping to it directly.

Change-Id: Ifea8351d609c0dc4ec82bd459942a197243dd5f1
parent 7695fad9

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+4 −3
Original line number Diff line number Diff line
@@ -706,7 +706,6 @@ public class BatteryMeterView extends View implements DemoMode { 
        private void drawCircle(Canvas canvas, BatteryTracker tracker,

                float textX, RectF drawRect) {

            boolean unknownStatus = tracker.status == BatteryManager.BATTERY_STATUS_UNKNOWN;

            int animOffset = tracker.shouldIndicateCharging() ? mAnimOffset : 0;

            int level = tracker.level;

            Paint paint;
@@ -724,7 +723,7 @@ public class BatteryMeterView extends View implements DemoMode { 
            // draw thin gray ring first

            canvas.drawArc(drawRect, 270, 360, false, mBackPaint);

            // draw colored arc representing charge level

            canvas.drawArc(drawRect, 270 + animOffset, 3.6f * level, false, paint);

            canvas.drawArc(drawRect, 270 + mAnimOffset, 3.6f * level, false, paint);

            // if chosen by options, draw percentage text in the middle

            // always skip percentage when 100, so layout doesnt break

            if (unknownStatus) {
@@ -767,7 +766,9 @@ public class BatteryMeterView extends View implements DemoMode { 
         * uses mInvalidate for delayed invalidate() callbacks

         */

        private void updateChargeAnim(BatteryTracker tracker) {

            if (!tracker.shouldIndicateCharging()

            // Stop animation when battery is full or after the meter

            // rotated back to 0 after unplugging.

            if (!tracker.shouldIndicateCharging() && mAnimOffset == 0

                    || tracker.status == BatteryManager.BATTERY_STATUS_FULL) {

                if (mIsAnimating) {

                    mIsAnimating = false;