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

Unverified Commit 924c42ba authored by Zhao Wei Liew's avatar Zhao Wei Liew Committed by Michael Bestas
Browse files

Revert "SystemUI: Add support for charging animation" 

No thanks. Stick with Google's decision to save power.

This reverts commit 5fce2f7e.

Change-Id: Ie56126016a87bcbc907734bbe37e26e79efc4f3c
parent 5957d529

packages/SystemUI/res/values/config.xml

100755 → 100644
+0 −3
Original line number Diff line number Diff line
@@ -328,9 +328,6 @@ 
    <!-- Show 4GLTE for LTE -->

    <bool name="show_4glte_icon_for_lte">false</bool>



    <!-- When true, show charging animation -->

    <bool name="config_show_battery_charging_anim">false</bool>



    <!-- Whether or not to show battery level text. -->

    <bool name="config_showBatteryPercentage">false</bool>

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

+9 −38
Original line number Diff line number Diff line
@@ -100,17 +100,6 @@ public class BatteryMeterDrawable extends Drawable implements 
    private int mLevel = -1;

    private boolean mPluggedIn;

    private boolean mListening;

    private static final int ADD_LEVEL = 10;

    private static final int ANIM_DURATION = 500;

    private int mAnimOffset;

    private boolean mCharging;



    private final Runnable mInvalidate = new Runnable() {

        @Override

        public void run() {

            invalidateSelf();

        }

    };



    public BatteryMeterDrawable(Context context, Handler handler, int frameColor) {

        mContext = context;
@@ -210,7 +199,12 @@ public class BatteryMeterDrawable extends Drawable implements 
    }



    private void postInvalidate() {

        mHandler.post(mInvalidate);

        mHandler.post(new Runnable() {

            @Override

            public void run() {

                invalidateSelf();

            }

        });

    }



    public void setBatteryController(BatteryController batteryController) {
@@ -222,7 +216,7 @@ public class BatteryMeterDrawable extends Drawable implements 
    public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {

        mLevel = level;

        mPluggedIn = pluggedIn;

        mCharging = charging;



        postInvalidate();

    }
@@ -232,26 +226,6 @@ public class BatteryMeterDrawable extends Drawable implements 
        invalidateSelf();

    }



    private int updateChargingAnimLevel() {

        int curLevel = mLevel;

        if (!mCharging) {

            mAnimOffset = 0;

            mHandler.removeCallbacks(mInvalidate);

        } else {

            curLevel += mAnimOffset;

            if (curLevel >= FULL) {

                curLevel = 100;

                mAnimOffset = 0;

            } else {

                mAnimOffset += ADD_LEVEL;

            }



            mHandler.removeCallbacks(mInvalidate);

            mHandler.postDelayed(mInvalidate, ANIM_DURATION);

        }

        return curLevel;

    }



    private static float[] loadBoltPoints(Resources res) {

        final int[] pts = res.getIntArray(R.array.batterymeter_bolt_points);

        int maxX = 0, maxY = 0;
@@ -349,11 +323,7 @@ public class BatteryMeterDrawable extends Drawable implements 


    @Override

    public void draw(Canvas c) {

        final boolean showChargingAnim

                = mContext.getResources().getBoolean(R.bool.config_show_battery_charging_anim);

        final int level = showChargingAnim

                ? updateChargingAnimLevel()

                : mLevel;

        final int level = mLevel;



        if (level == -1) return;
@@ -547,4 +517,5 @@ public class BatteryMeterDrawable extends Drawable implements 
            postInvalidate();

        }

    }



}