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

Commit 6037b255 authored by Bruno Martins's avatar Bruno Martins
Browse files

fixup!^2 BatteryMeterView: Hide icon on battery-less devices 

This reverts commit b09bbae0
and fixes commit c0f798b7.

Change-Id: I117883d945f64aec1f9fc45d4206d59861dea1d9
parent aa7d2fe3

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

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

    private String mEstimateText = null;

    private boolean mPluggedIn;

    private boolean mPresent = true;

    private boolean mPresent;

    private boolean mPowerSaveEnabled;

    private boolean mIsBatteryDefender;

    private boolean mIsIncompatibleCharging;

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

+4 −0
Original line number Diff line number Diff line
@@ -169,8 +169,12 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
        mBatteryController = batteryController;



        mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);

        mView.setBatteryPresence(mBatteryController.isPresent());

        mView.setDisplayShieldEnabled(

                getContext().getResources().getBoolean(R.bool.flag_battery_shield_icon));

        if (!mBatteryController.isPresent()) {

            mView.setVisibility(View.GONE);

        }



        mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);

        mSettingObserver = new SettingObserver(mMainHandler);

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

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


    protected int mLevel;

    protected boolean mPluggedIn;

    protected boolean mPresent = true;

    protected boolean mPresent;

    private int mPluggedChargingSource;

    protected boolean mCharging;

    private boolean mStateUnknown = false;
@@ -271,7 +271,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
                fireBatteryPresentChanged();

            }



            boolean unknown = !mPresent;

            boolean unknown = !present;

            if (unknown != mStateUnknown) {

                mStateUnknown = unknown;

                fireBatteryUnknownStateChanged();