diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java index 208fb2f84c27c..282c8a3f59ffa 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java @@ -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 @@ void setBatteryEstimateFetcher(BatteryEstimateFetcher fetcher) { mBatteryEstimateFetcher = fetcher; } - void setBatteryPresence(boolean isPresent) { - mPresent = isPresent; - } - void setDisplayShieldEnabled(boolean displayShieldEnabled) { mDisplayShieldEnabled = displayShieldEnabled; } @@ -610,7 +605,7 @@ void onBatteryUnknownStateChanged(boolean isUnknown) { mBatteryStateUnknown = isUnknown; updateContentDescription(); - if (mBatteryStateUnknown && mPresent) { + if (mBatteryStateUnknown) { mBatteryIconView.setImageDrawable(getUnknownStateDrawable()); } else { updateDrawable(); @@ -698,10 +693,6 @@ void scaleBatteryMeterViewsLegacy() { } private void updateDrawable() { - if (!mPresent) { - return; - } - switch (getBatteryStyle()) { case BATTERY_STYLE_PORTRAIT: mBatteryIconView.setImageDrawable(mAccessorizedDrawable); @@ -817,7 +808,6 @@ public void dump(PrintWriter pw, String[] args) { pw.println(" mBatteryStateUnknown: " + mBatteryStateUnknown); pw.println(" mIsIncompatibleCharging: " + mIsIncompatibleCharging); pw.println(" mPluggedIn: " + mPluggedIn); - pw.println(" mPresent: " + mPresent); pw.println(" mLevel: " + mLevel); pw.println(" mMode: " + mShowPercentMode); } diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java index 90f2d5adfc4a1..bb856b1a9daa9 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java +++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java @@ -116,13 +116,6 @@ public void onIsIncompatibleChargingChanged(boolean isIncompatibleCharging) { } } - @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 BatteryMeterViewController( 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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java index 8b662257c9f58..37eda6490ec28 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java @@ -81,11 +81,6 @@ default boolean isPluggedInWireless() { 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 @@ default void onIsBatteryDefenderChanged(boolean isBatteryDefender) { default void onIsIncompatibleChargingChanged(boolean isIncompatibleCharging) { } - default void onBatteryPresentChanged(boolean batteryPresent) { - } - @Override default void dump(@NonNull PrintWriter pw, @NonNull String[] args) { pw.println(this); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java index 65c28cc51b7cc..45078e32108d3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java @@ -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 void dump(@NonNull PrintWriter pw, @NonNull String[] args) { 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 void addCallback(@NonNull BatteryController.BatteryStateChangeCallback cb cb.onWirelessChargingChanged(mWirelessCharging); cb.onIsBatteryDefenderChanged(mIsBatteryDefender); cb.onIsIncompatibleChargingChanged(mIsIncompatibleCharging); - cb.onBatteryPresentChanged(mPresent); } @Override @@ -266,11 +263,6 @@ public void onReceive(final Context context, Intent intent) { } 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 boolean isPluggedIn() { return mPluggedIn; } - @Override - public boolean isPresent() { - return mPresent; - } - @Override public boolean isPowerSave() { return mPowerSave; @@ -497,11 +484,6 @@ private void fireIsIncompatibleChargingChanged() { (callback) -> callback.onIsIncompatibleChargingChanged(mIsIncompatibleCharging)); } - private void fireBatteryPresentChanged() { - dispatchSafeChange( - (callback) -> callback.onBatteryPresentChanged(mPresent)); - } - @Override public void dispatchDemoCommand(String command, Bundle args) { if (!mDemoModeController.isInDemoMode()) {