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

Commit 6aa6e6e6 authored by Dan Sandler's avatar Dan Sandler
Browse files

Clean up BatteryMeterDrawable internal api. 

Bug: 32539932
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/BatteryMeterDrawableTest.java
Change-Id: Ifdc3368b930abcf248b60ee99f6f9139ad804f91
parent 77aee712

packages/SettingsLib/src/com/android/settingslib/graph/BatteryMeterDrawableBase.java

+28 −31
Original line number Diff line number Diff line
@@ -37,14 +37,13 @@ public class BatteryMeterDrawableBase extends Drawable { 


    private static final float ASPECT_RATIO = 9.5f / 14.5f;

    public static final String TAG = BatteryMeterDrawableBase.class.getSimpleName();

    public static final String SHOW_PERCENT_SETTING = "status_bar_show_battery_percent";



    protected final Context mContext;



    protected int mLevel = -1;

    protected boolean mPluggedIn;

    protected boolean mPowerSaveEnabled;

    protected boolean mShowPercent;

    private int mLevel = -1;

    private boolean mPluggedIn;

    private boolean mPowerSaveEnabled;

    private boolean mShowPercent;



    private static final boolean SINGLE_DIGIT_PERCENT = false;
@@ -104,7 +103,7 @@ public class BatteryMeterDrawableBase extends Drawable { 
        }

        levels.recycle();

        colors.recycle();

        updateShowPercent();



        mWarningString = context.getString(R.string.battery_meter_very_low_overlay_symbol);

        mCriticalLevel = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_criticalBatteryWarningLevel);
@@ -143,10 +142,10 @@ public class BatteryMeterDrawableBase extends Drawable { 


        mBoltPaint = new Paint(Paint.ANTI_ALIAS_FLAG);

        mBoltPaint.setColor(Utils.getDefaultColor(mContext, R.color.batterymeter_bolt_color));

        mBoltPoints = loadBoltPoints(res);

        mBoltPoints = loadPoints(res, R.array.batterymeter_bolt_points);



        mPlusPaint = new Paint(mBoltPaint);

        mPlusPoints = loadPlusPoints(res);

        mPlusPoints = loadPoints(res, R.array.batterymeter_plus_points);



        mDarkModeBackgroundColor =

                Utils.getDefaultColor(mContext, R.color.dark_mode_icon_color_dual_tone_background);
@@ -171,32 +170,34 @@ public class BatteryMeterDrawableBase extends Drawable { 
        return mIntrinsicWidth;

    }



    public void disableShowPercent() {

        mShowPercent = false;

    public void setShowPercent(boolean show) {

        mShowPercent = show;

        postInvalidate();

    }



    protected void postInvalidate() {

        scheduleSelf(this::invalidateSelf, 0);

    public void setPluggedIn(boolean val) {

        mPluggedIn = val;

        postInvalidate();

    }



    private static float[] loadBoltPoints(Resources res) {

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

        int maxX = 0, maxY = 0;

        for (int i = 0; i < pts.length; i += 2) {

            maxX = Math.max(maxX, pts[i]);

            maxY = Math.max(maxY, pts[i + 1]);

    public void setBatteryLevel(int val) {

        mLevel = val;

        postInvalidate();

    }

        final float[] ptsF = new float[pts.length];

        for (int i = 0; i < pts.length; i += 2) {

            ptsF[i] = (float) pts[i] / maxX;

            ptsF[i + 1] = (float) pts[i + 1] / maxY;



    public void setPowerSave(boolean val) {

        mPowerSaveEnabled = val;

        postInvalidate();

    }

        return ptsF;



    // an approximation of View.postInvalidate()

    protected void postInvalidate() {

        unscheduleSelf(this::invalidateSelf);

        scheduleSelf(this::invalidateSelf, 0);

    }



    private static float[] loadPlusPoints(Resources res) {

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

    private static float[] loadPoints(Resources res, int pointArrayRes) {

        final int[] pts = res.getIntArray(pointArrayRes);

        int maxX = 0, maxY = 0;

        for (int i = 0; i < pts.length; i += 2) {

            maxX = Math.max(maxX, pts[i]);
@@ -219,10 +220,6 @@ public class BatteryMeterDrawableBase extends Drawable { 
        mWarningTextHeight = -mWarningTextPaint.getFontMetrics().ascent;

    }



    protected void updateShowPercent() {

        mShowPercent = true;

    }



    private int getColorForLevel(int percent) {

        // If we are in power save mode, always use the normal color.

        if (mPowerSaveEnabled) {

packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java

+20 −0
Original line number Diff line number Diff line
@@ -48,4 +48,24 @@ public class BatteryMeterDrawableBaseTest { 
        verify(canvas, never()).drawPath(any(), any());

        verify(canvas, never()).drawText(anyString(), anyFloat(), anyFloat(), any());

    }



    @Test

    public void testDrawingForTypicalValues() {

        final Canvas canvas = mock(Canvas.class);

        final int levels[] = { 0, 1, 5, 10, 25, 50, 75, 90, 95, 99, 100 };

        final boolean bools[] = { false, true };

        for (int l : levels) {

            for (boolean plugged : bools) {

                for (boolean saver : bools) {

                    for (boolean percent : bools) {

                        mBatteryDrawable.setBatteryLevel(l);

                        mBatteryDrawable.setPowerSave(saver);

                        mBatteryDrawable.setPluggedIn(plugged);

                        mBatteryDrawable.setShowPercent(percent);

                        mBatteryDrawable.draw(canvas);

                    }

                }

            }

        }

    }

}

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

+8 −10
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import com.android.systemui.statusbar.policy.BatteryController; 
public class BatteryMeterDrawable extends BatteryMeterDrawableBase implements

        BatteryController.BatteryStateChangeCallback {



    public static final String SHOW_PERCENT_SETTING = "status_bar_show_battery_percent";



    private BatteryController mBatteryController;

    private SettingObserver mSettingObserver;
@@ -38,16 +40,13 @@ public class BatteryMeterDrawable extends BatteryMeterDrawableBase implements 


    @Override

    public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {

        mLevel = level;

        mPluggedIn = pluggedIn;



        postInvalidate();

        setBatteryLevel(level);

        setPluggedIn(pluggedIn);

    }



    @Override

    public void onPowerSaveChanged(boolean isPowerSave) {

        mPowerSaveEnabled = isPowerSave;

        invalidateSelf();

        setPowerSave(isPowerSave);

    }



    public void startListening() {
@@ -62,15 +61,14 @@ public class BatteryMeterDrawable extends BatteryMeterDrawableBase implements 
        mBatteryController.removeCallback(this);

    }



    @Override

    protected void updateShowPercent() {

        mShowPercent = 0 != Settings.System.getInt(mContext.getContentResolver(),

                SHOW_PERCENT_SETTING, 0);

        setShowPercent(0 != Settings.System.getInt(mContext.getContentResolver(),

                SHOW_PERCENT_SETTING, 0));

    }



    public void setBatteryController(BatteryController batteryController) {

        mBatteryController = batteryController;

        mPowerSaveEnabled = mBatteryController.isPowerSave();

        setPowerSave(mBatteryController.isPowerSave());

    }



    private final class SettingObserver extends ContentObserver {

packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll 
            }

            mDrawable.onBatteryLevelChanged(100, false, false);

            mDrawable.onPowerSaveChanged(true);

            mDrawable.disableShowPercent();

            mDrawable.setShowPercent(false);

            ((ImageView) mCurrentView.findViewById(android.R.id.icon)).setImageDrawable(mDrawable);

            Checkable checkbox = (Checkable) mCurrentView.findViewById(android.R.id.toggle);

            checkbox.setChecked(mPowerSave);

packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.systemui.Dependency;

import com.android.systemui.statusbar.phone.StatusBarIconController;



import static com.android.settingslib.graph.BatteryMeterDrawableBase.SHOW_PERCENT_SETTING;

import static com.android.systemui.BatteryMeterDrawable.SHOW_PERCENT_SETTING;



public class BatteryPreference extends DropDownPreference implements TunerService.Tunable {