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

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

Merge branch '2421-t-fix_battery_error' into 'v2.3-t' 

fixup! BatteryMeterView: Hide icon on battery-less devices

See merge request e/os/android_frameworks_base!215
parents 734ff666 1769dc43

core/res/res/values-ru/e_strings.xml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources></resources>
 
 No newline at end of file

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

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

    private String mEstimateText = null;

    private boolean mCharging;

    private boolean mPresent;

    private boolean mPresent = true;

    private boolean mIsOverheated;

    private boolean mDisplayShieldEnabled;

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

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

+7 −4
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
                public void onIsOverheatedChanged(boolean isOverheated) {

                    mView.onIsOverheatedChanged(isOverheated);

                }



                @Override

                public void onBatteryPresentChanged(boolean batteryPresent) {

                    mView.setBatteryPresence(batteryPresent);

                    mView.setVisibility(!batteryPresent || mBatteryHidden

                            ? View.GONE : View.VISIBLE);

                }

            };



    private final UserTracker.Callback mUserChangedCallback =
@@ -139,11 +146,7 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
        mBatteryController = batteryController;



        mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);

        mView.setBatteryPresence(mBatteryController.isPresent());

        mView.setDisplayShieldEnabled(featureFlags.isEnabled(Flags.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/BatteryController.java

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ public interface BatteryController extends DemoMode, 


        default void onIsOverheatedChanged(boolean isOverheated) {

        }



        default void onBatteryPresentChanged(boolean batteryPresent) {

        }

    }



    /**

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

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


    protected int mLevel;

    protected boolean mPluggedIn;

    protected boolean mPresent;

    protected boolean mPresent = true;

    private int mPluggedChargingSource;

    protected boolean mCharging;

    private boolean mStateUnknown = false;
@@ -197,6 +197,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        cb.onBatteryUnknownStateChanged(mStateUnknown);

        cb.onWirelessChargingChanged(mWirelessCharging);

        cb.onIsOverheatedChanged(mIsOverheated);

        cb.onBatteryPresentChanged(mPresent);

    }



    @Override
@@ -228,7 +229,12 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
                fireWirelessChargingChanged();

            }



            mPresent = intent.getBooleanExtra(EXTRA_PRESENT, true);

            boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);

            if (present != mPresent) {

                mPresent = present;

                fireBatteryPresentChanged();

            }



            boolean unknown = !mPresent;

            if (unknown != mStateUnknown) {

                mStateUnknown = unknown;
@@ -441,6 +447,15 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        }

    }



    private void fireBatteryPresentChanged() {

        synchronized (mChangeCallbacks) {

            final int n = mChangeCallbacks.size();

            for (int i = 0; i < n; i++) {

                mChangeCallbacks.get(i).onBatteryPresentChanged(mPresent);

            }

        }

    }



    @Override

    public void dispatchDemoCommand(String command, Bundle args) {

        if (!mDemoModeController.isInDemoMode()) {