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

Commit d787c59e authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge remote-tracking branch 'origin/v2.5-t' into v1-t

parents 4b6eeb37 5b13e7ee

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
    private int mShowPercentMode = MODE_DEFAULT;

    private int mShowPercentMode = MODE_DEFAULT;

    private String mEstimateText = null;

    private String mEstimateText = null;

    private boolean mCharging;

    private boolean mCharging;

    private boolean mPresent;

    private boolean mPresent = true;

    private boolean mIsOverheated;

    private boolean mIsOverheated;

    private boolean mDisplayShieldEnabled;

    private boolean mDisplayShieldEnabled;

    // Error state where we know nothing about the current battery state

    // Error state where we know nothing about the current battery state

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 




    protected int mLevel;

    protected int mLevel;

    protected boolean mPluggedIn;

    protected boolean mPluggedIn;

    protected boolean mPresent;

    protected boolean mPresent = true;

    private int mPluggedChargingSource;

    private int mPluggedChargingSource;

    protected boolean mCharging;

    protected boolean mCharging;

    private boolean mStateUnknown = false;

    private boolean mStateUnknown = false;