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

Commit 81905164 authored by Evan Laird's avatar Evan Laird
Browse files

Wicked good battery saver + rotation icons! 

Still drawing battery saver QS icon in code, though it's gaining some
hackery

Test: visual
Change-Id: Id773c036a5823dcb6c679fa0e6b649f26da4e017
Fixes: 80152065
parent 6433ac13

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class BatteryMeterDrawableBase extends Drawable { 
    private int mLevel = -1;

    private boolean mCharging;

    private boolean mPowerSaveEnabled;

    private boolean mPowerSaveAsColorError = true;

    protected boolean mPowerSaveAsColorError = true;

    private boolean mShowPercent;



    private static final boolean SINGLE_DIGIT_PERCENT = false;

packages/SystemUI/res/drawable/ic_qs_auto_rotate.xml

+5 −40
Original line number Diff line number Diff line
@@ -18,44 +18,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:height="48dp"

    android:width="48dp"

    android:viewportHeight="48"

    android:viewportWidth="48">

    <group

        android:name="device"

        android:translateX="24"

        android:translateY="24" >

        <group

            android:name="device_pivot"

            android:translateX="-24.15"

            android:translateY="-24.25" >

            <group

                android:name="device_0"

                android:translateX="24.14999"

                android:translateY="24.25" >

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

                    android:name="device_merged"

                    android:pathData="M -3.5,-20.5 c -1.19999694824,-1.19999694824 -3.10000610352,-1.19999694824 -4.19999694824,0.0 c 0.0,0.0 -12.8000030518,12.6999969482 -12.8000030518,12.6999969482 c -1.19999694824,1.19999694824 -1.19999694824,3.10000610352 0.0,4.19999694824 c 0.0,0.0 24.0,24.0000152588 24.0,24.0000152588 c 1.19999694824,1.19999694824 3.10000610352,1.19999694824 4.19999694824,0.0 c 0.0,0.0 12.6999969482,-12.700012207 12.6999969482,-12.700012207 c 1.20001220703,-1.19999694824 1.20001220703,-3.09999084473 0.0,-4.19999694824 c 0.0,0.0 -23.8999938965,-24.0 -23.8999938965,-24.0 Z M 2.84999084473,15.5500183105 c 0.0,0.0 -18.6000061035,-18.5000457764 -18.6000061035,-18.5000457764 c 0.0,0.0 12.5999908447,-12.8000030518 12.5999908447,-12.8000030518 c 0.0,0.0 18.6000213623,18.5000457764 18.6000213623,18.5000457764 c 0.0,0.0 -12.6000061035,12.8000030518 -12.6000061035,12.8000030518 Z"

                    android:fillColor="#FFFFFFFF" />

            </group>

        </group>

    </group>

    <group

        android:name="arrows"

        android:translateX="24"

        android:translateY="24" >

        <group

            android:name="arrows_pivot"

            android:translateX="-24.0798"

            android:translateY="-24.23" >

            <group

                android:name="arrows_0"

                android:translateX="12.2505"

                android:translateY="37.2145" >

                <path

                    android:name="bottom_merged"

                    android:pathData="M 20.7395019531,-31.9844970703 c 6.23999023438,2.83999633789 10.6999969482,8.7200012207 11.8399963379,15.7799987793 c 0.119995117188,0.699996948242 0.740005493164,1.2200012207 1.46099853516,1.2200012207 c 0.919998168945,0.0 1.6190032959,-0.84001159668 1.47900390625,-1.74000549316 c -1.75900268555,-10.3800048828 -9.75900268555,-19.1199951172 -22.5800018311,-20.1600036621 c -0.919998168945,-0.0800018310547 -1.43899536133,1.04000854492 -0.800003051758,1.70001220703 c 0.0,0.0 5.12100219727,5.11999511719 5.12100219727,5.11999511719 c 0.378997802734,0.380004882812 0.97900390625,0.380004882812 1.37899780273,0.020004272461 c 0.0,0.0 2.10000610352,-1.94000244141 2.10000610352,-1.94000244141 Z M 2.73950195312,6.01550292969 c -6.26000976562,-2.83999633789 -10.7200012207,-8.76000976562 -11.8399963379,-15.8600006104 c -0.118011474609,-0.667007446289 -0.702011108398,-1.15100097656 -1.38000488281,-1.13999938965 c -0.860000610352,0.0 -1.52000427246,0.759994506836 -1.38000488281,1.61999511719 c 1.54000854492,10.4000091553 9.5,19.2200012207 22.4199981689,20.2799987793 c 0.920013427734,0.0800018310547 1.44100952148,-1.03999328613 0.800003051758,-1.69999694824 c 0.0,0.0 -5.11999511719,-5.11999511719 -5.11999511719,-5.11999511719 c -0.380004882812,-0.376007080078 -0.988998413086,-0.385009765625 -1.38000488281,-0.0200042724609 c 0.0,0.0 -2.11999511719,1.94000244141 -2.11999511719,1.94000244141 Z"

                    android:fillColor="#FFFFFFFF" />

            </group>

        </group>

    </group>

        android:fillColor="#FFFFFFFF"

        android:pathData="M12.72,23H11C5.49,23 1,18.51 1,13h2c0,3.78 2.63,6.95 6.15,7.79L8.13,19L9.87,18L12.72,23zM13,1h-1.72l2.85,5L15.87,5l-1.02,-1.79C18.37,4.05 21,7.22 21,11h2C23,5.49 18.51,1 13,1zM10.23,6L18,13.76L13.77,18L6,10.24L10.23,6C10.23,6 10.23,6 10.23,6M10.23,4C9.72,4 9.21,4.2 8.82,4.59L4.59,8.82c-0.78,0.78 -0.78,2.04 0,2.82l7.77,7.77c0.39,0.39 0.9,0.59 1.41,0.59c0.51,0 1.02,-0.2 1.41,-0.59l4.24,-4.24c0.78,-0.78 0.78,-2.04 0,-2.82l-7.77,-7.77C11.26,4.2 10.75,4 10.23,4L10.23,4z"/>

</vector>

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

+8 −2
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements 


        @Override

        public Drawable getDrawable(Context context) {

            BatterySaverDrawable b = new BatterySaverDrawable(context, 0);

            BatterySaverDrawable b =

                    new BatterySaverDrawable(context, QSTileImpl.getColorForState(context, mState));

            b.mState = mState;

            final int pad = context.getResources()

                    .getDimensionPixelSize(R.dimen.qs_tile_divider_height);
@@ -130,11 +131,16 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements 
            setPowerSave(true);

            setCharging(false);

            setPowerSaveAsColorError(false);

            mPowerSaveAsColorError = true;

            mFramePaint.setColor(0);

            mPowersavePaint.setColor(frameColor);

            mFramePaint.setStrokeWidth(mPowersavePaint.getStrokeWidth());

            mPlusPaint.setColor(frameColor);

        }



        @Override

        protected int batteryColorForLevel(int level) {

            return QSTileImpl.getColorForState(mContext, mState);

            return 0;

        }



        @Override