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

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

Revert "BatteryMeterView: Hide icon on battery-less devices" 

This reverts commit 6037b255.

This reverts commit b09bbae0.

This reverts commit c0f798b7.

This reverts commit 405ece00.

This reverts commit 629cf3b3.

Change-Id: I92f02cc8845336fe13487ec598e53f92cf71dd2d
parent ed631e82

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

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

    private String mEstimateText = null;

    private boolean mPluggedIn;

    private boolean mPresent;

    private boolean mPowerSaveEnabled;

    private boolean mIsBatteryDefender;

    private boolean mIsIncompatibleCharging;
@@ -390,10 +389,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        mBatteryEstimateFetcher = fetcher;

    }



    void setBatteryPresence(boolean isPresent) {

        mPresent = isPresent;

    }



    void setDisplayShieldEnabled(boolean displayShieldEnabled) {

        mDisplayShieldEnabled = displayShieldEnabled;

    }
@@ -610,7 +605,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        mBatteryStateUnknown = isUnknown;

        updateContentDescription();



        if (mBatteryStateUnknown && mPresent) {

        if (mBatteryStateUnknown) {

            mBatteryIconView.setImageDrawable(getUnknownStateDrawable());

        } else {

            updateDrawable();
@@ -698,10 +693,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
    }



    private void updateDrawable() {

        if (!mPresent) {

            return;

        }



        switch (getBatteryStyle()) {

            case BATTERY_STYLE_PORTRAIT:

                mBatteryIconView.setImageDrawable(mAccessorizedDrawable);
@@ -817,7 +808,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        pw.println("    mBatteryStateUnknown: " + mBatteryStateUnknown);

        pw.println("    mIsIncompatibleCharging: " + mIsIncompatibleCharging);

        pw.println("    mPluggedIn: " + mPluggedIn);

        pw.println("    mPresent: " + mPresent);

        pw.println("    mLevel: " + mLevel);

        pw.println("    mMode: " + mShowPercentMode);

    }

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

+0 −11
Original line number Diff line number Diff line
@@ -116,13 +116,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
                    }

                }



                @Override

                public void onBatteryPresentChanged(boolean batteryPresent) {

                    mView.setBatteryPresence(batteryPresent);

                    mView.setVisibility(!batteryPresent || mBatteryHidden

                            ? View.GONE : View.VISIBLE);

                }



                @Override

                public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

                    pw.print(super.toString());
@@ -169,12 +162,8 @@ 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/BatteryController.java

+0 −8
Original line number Diff line number Diff line
@@ -81,11 +81,6 @@ public interface BatteryController extends DemoMode, 
        return false;

    }



    /**

     * Returns {@code true} if there's a battery present in the device.

     */

    default boolean isPresent() { return true; }



    /**

     * Returns {@code true} if the device is currently in power save mode.

     */
@@ -170,9 +165,6 @@ public interface BatteryController extends DemoMode, 
        default void onIsIncompatibleChargingChanged(boolean isIncompatibleCharging) {

        }



        default void onBatteryPresentChanged(boolean batteryPresent) {

        }



        @Override

        default void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

            pw.println(this);

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

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


    protected int mLevel;

    protected boolean mPluggedIn;

    protected boolean mPresent;

    private int mPluggedChargingSource;

    protected boolean mCharging;

    private boolean mStateUnknown = false;
@@ -177,7 +176,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        ipw.print("mHasReceivedBattery="); ipw.println(mHasReceivedBattery);

        ipw.print("mLevel="); ipw.println(mLevel);

        ipw.print("mPluggedIn="); ipw.println(mPluggedIn);

        ipw.print("mPresent="); ipw.println(mPresent);

        ipw.print("mCharging="); ipw.println(mCharging);

        ipw.print("mCharged="); ipw.println(mCharged);

        ipw.print("mIsBatteryDefender="); ipw.println(mIsBatteryDefender);
@@ -228,7 +226,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        cb.onWirelessChargingChanged(mWirelessCharging);

        cb.onIsBatteryDefenderChanged(mIsBatteryDefender);

        cb.onIsIncompatibleChargingChanged(mIsIncompatibleCharging);

        cb.onBatteryPresentChanged(mPresent);

    }



    @Override
@@ -266,11 +263,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
            }



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

            if (present != mPresent) {

                mPresent = present;

                fireBatteryPresentChanged();

            }



            boolean unknown = !present;

            if (unknown != mStateUnknown) {

                mStateUnknown = unknown;
@@ -343,11 +335,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        return mPluggedIn;

    }



    @Override

    public boolean isPresent() {

        return mPresent;

    }



    @Override

    public boolean isPowerSave() {

        return mPowerSave;
@@ -497,11 +484,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
                (callback) -> callback.onIsIncompatibleChargingChanged(mIsIncompatibleCharging));

    }



    private void fireBatteryPresentChanged() {

        dispatchSafeChange(

                (callback) -> callback.onBatteryPresentChanged(mPresent));

    }



    @Override

    public void dispatchDemoCommand(String command, Bundle args) {

        if (!mDemoModeController.isInDemoMode()) {