Merge branch 'lineage-20.0' of https://github.com/LineageOS/android_frameworks_base into v1-t (ca5b231b) · Commits · e / os / android_frameworks_base

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

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,6 @@ 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 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
	@@ -269,10 +268,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	mBatteryEstimateFetcher = fetcher;		mBatteryEstimateFetcher = fetcher;
	}		}

	void setBatteryPresence(boolean isPresent) {
	mPresent = isPresent;
	}

	void setDisplayShieldEnabled(boolean displayShieldEnabled) {		void setDisplayShieldEnabled(boolean displayShieldEnabled) {
	mDisplayShieldEnabled = displayShieldEnabled;		mDisplayShieldEnabled = displayShieldEnabled;
	}		}
	@@ -415,7 +410,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	mBatteryStateUnknown = isUnknown;		mBatteryStateUnknown = isUnknown;
	updateContentDescription();		updateContentDescription();

	if (mBatteryStateUnknown && mPresent) {		if (mBatteryStateUnknown) {
	mBatteryIconView.setImageDrawable(getUnknownStateDrawable());		mBatteryIconView.setImageDrawable(getUnknownStateDrawable());
	} else {		} else {
	updateDrawable();		updateDrawable();
	@@ -476,10 +471,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	}		}

	private void updateDrawable() {		private void updateDrawable() {
	if (!mPresent) {
	return;
	}

	switch (getBatteryStyle()) {		switch (getBatteryStyle()) {
	case BATTERY_STYLE_PORTRAIT:		case BATTERY_STYLE_PORTRAIT:
	mBatteryIconView.setImageDrawable(mAccessorizedDrawable);		mBatteryIconView.setImageDrawable(mAccessorizedDrawable);
	@@ -545,7 +536,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
	pw.println(" mBatteryStateUnknown: " + mBatteryStateUnknown);		pw.println(" mBatteryStateUnknown: " + mBatteryStateUnknown);
	pw.println(" mLevel: " + mLevel);		pw.println(" mLevel: " + mLevel);
	pw.println(" mMode: " + mShowPercentMode);		pw.println(" mMode: " + mShowPercentMode);
	pw.println(" mPresent: " + mPresent);
	}		}

	@VisibleForTesting		@VisibleForTesting

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

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -102,13 +102,6 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
	public void onIsOverheatedChanged(boolean isOverheated) {		public void onIsOverheatedChanged(boolean isOverheated) {
	mView.onIsOverheatedChanged(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 =		private final UserTracker.Callback mUserChangedCallback =
	@@ -146,11 +139,7 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
	mBatteryController = batteryController;		mBatteryController = batteryController;

	mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);		mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);
	mView.setBatteryPresence(mBatteryController.isPresent());
	mView.setDisplayShieldEnabled(featureFlags.isEnabled(Flags.BATTERY_SHIELD_ICON));		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);		mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);
	mSettingObserver = new SettingObserver(mMainHandler);		mSettingObserver = new SettingObserver(mMainHandler);

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -78,11 +78,6 @@ public interface BatteryController extends DemoMode,
	return false;		return false;
	}		}

	/**
	* Returns {@code true} if there's a battery present in the device.
	*/
	boolean isPresent();

	/**		/**
	* Returns {@code true} if the device is currently in power save mode.		* Returns {@code true} if the device is currently in power save mode.
	*/		*/
	@@ -163,9 +158,6 @@ public interface BatteryController extends DemoMode,

	default void onIsOverheatedChanged(boolean isOverheated) {		default void onIsOverheatedChanged(boolean isOverheated) {
	}		}

	default void onBatteryPresentChanged(boolean batteryPresent) {
	}
	}		}

	/**		/**

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

+0 −22

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

	protected int mLevel;		protected int mLevel;
	protected boolean mPluggedIn;		protected boolean mPluggedIn;
	protected boolean mPresent;
	private int mPluggedChargingSource;		private int mPluggedChargingSource;
	protected boolean mCharging;		protected boolean mCharging;
	private boolean mStateUnknown = false;		private boolean mStateUnknown = false;
	@@ -160,7 +159,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	pw.println("BatteryController state:");		pw.println("BatteryController state:");
	pw.print(" mLevel="); pw.println(mLevel);		pw.print(" mLevel="); pw.println(mLevel);
	pw.print(" mPluggedIn="); pw.println(mPluggedIn);		pw.print(" mPluggedIn="); pw.println(mPluggedIn);
	pw.print(" mPresent="); pw.println(mPresent);
	pw.print(" mCharging="); pw.println(mCharging);		pw.print(" mCharging="); pw.println(mCharging);
	pw.print(" mCharged="); pw.println(mCharged);		pw.print(" mCharged="); pw.println(mCharged);
	pw.print(" mIsOverheated="); pw.println(mIsOverheated);		pw.print(" mIsOverheated="); pw.println(mIsOverheated);
	@@ -197,7 +195,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	cb.onBatteryUnknownStateChanged(mStateUnknown);		cb.onBatteryUnknownStateChanged(mStateUnknown);
	cb.onWirelessChargingChanged(mWirelessCharging);		cb.onWirelessChargingChanged(mWirelessCharging);
	cb.onIsOverheatedChanged(mIsOverheated);		cb.onIsOverheatedChanged(mIsOverheated);
	cb.onBatteryPresentChanged(mPresent);
	}		}

	@Override		@Override
	@@ -230,11 +227,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	}		}

	boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);		boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);
	if (present != mPresent) {
	mPresent = present;
	fireBatteryPresentChanged();
	}

	boolean unknown = !present;		boolean unknown = !present;
	if (unknown != mStateUnknown) {		if (unknown != mStateUnknown) {
	mStateUnknown = unknown;		mStateUnknown = unknown;
	@@ -298,11 +290,6 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
	return mPluggedIn;		return mPluggedIn;
	}		}

	@Override
	public boolean isPresent() {
	return mPresent;
	}

	@Override		@Override
	public boolean isPowerSave() {		public boolean isPowerSave() {
	return mPowerSave;		return mPowerSave;
	@@ -447,15 +434,6 @@ 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		@Override
	public void dispatchDemoCommand(String command, Bundle args) {		public void dispatchDemoCommand(String command, Bundle args) {
	if (!mDemoModeController.isInDemoMode()) {		if (!mDemoModeController.isInDemoMode()) {

packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/FakeBatteryController.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -56,11 +56,6 @@ public class FakeBatteryController extends BaseLeakChecker<BatteryStateChangeCal
	return false;		return false;
	}		}

	@Override
	public boolean isPresent() {
	return true;
	}

	@Override		@Override
	public boolean isPowerSave() {		public boolean isPowerSave() {
	return false;		return false;