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

Commit 686328c4 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix battery icon dark initialization" into oc-dev am: cb4ed821 

am: 17e605aa

Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08
parents c5045a32 17e605aa

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class BatteryMeterDrawableBase extends Drawable { 
            mPlusPaint;

    private float mTextHeight, mWarningTextHeight;

    private int mIconTint = Color.WHITE;

    private float mOldDarkIntensity = 0f;

    private float mOldDarkIntensity = -1f;



    private int mHeight;

    private int mWidth;

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

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ public class BatteryMeterView extends LinearLayout implements 
        addView(mBatteryIconView, mlp);



        updateShowPercent();

        // Init to not dark at all.

        onDarkChanged(new Rect(), 0, DarkIconDispatcher.DEFAULT_ICON_TINT);

    }



    public void setForceShowPercent(boolean show) {