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

Commit 47c46dd5 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Battery icon tweaks." into klp-dev

parents 5f4affda d8595fd8

packages/SystemUI/res/layout/status_bar.xml

+2 −2
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <!-- battery must be padded below by 2px to match assets -->

                <!-- battery must be padded below to match assets -->

                <com.android.systemui.BatteryMeterView

                    android:id="@+id/battery"

                    android:layout_height="16dp"

                    android:layout_width="10.5dp"

                    android:layout_marginBottom="2px"

                    android:layout_marginBottom="0.33dp"

                    android:layout_marginStart="4dip"

                    />

            </LinearLayout>

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

+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class BatteryMeterView extends View implements DemoMode { 
    private final RectF mFrame = new RectF();

    private final RectF mButtonFrame = new RectF();

    private final RectF mClipFrame = new RectF();

    private final Rect mBoltFrame = new Rect();

    private final RectF mBoltFrame = new RectF();



    private class BatteryTracker extends BroadcastReceiver {

        public static final int UNKNOWN_LEVEL = -1;
@@ -319,10 +319,10 @@ public class BatteryMeterView extends View implements DemoMode { 


        if (tracker.plugged) {

            // draw the bolt

            final int bl = (int)(mFrame.left + mFrame.width() / 4.5f);

            final int bt = (int)(mFrame.top + mFrame.height() / 6f);

            final int br = (int)(mFrame.right - mFrame.width() / 7f);

            final int bb = (int)(mFrame.bottom - mFrame.height() / 10f);

            final float bl = mFrame.left + mFrame.width() / 4.5f;

            final float bt = mFrame.top + mFrame.height() / 6f;

            final float br = mFrame.right - mFrame.width() / 7f;

            final float bb = mFrame.bottom - mFrame.height() / 10f;

            if (mBoltFrame.left != bl || mBoltFrame.top != bt

                    || mBoltFrame.right != br || mBoltFrame.bottom != bb) {

                mBoltFrame.set(bl, bt, br, bb);