Merge "Add interfaces for reverse to BatteryController" into rvc-dev am: 538209843b (d3bc72a2) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BatteryControllerImpl;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		@@ -105,6 +107,11 @@ abstract class CarSystemUIModule {
		abstract NotificationLockscreenUserManager bindNotificationLockscreenUserManager(
		NotificationLockscreenUserManagerImpl notificationLockscreenUserManager);

		@Binds
		@Singleton
		public abstract BatteryController provideBatteryController(
		BatteryControllerImpl controllerImpl);

		@Binds
		abstract DockManager bindDockManager(DockManagerImpl dockManager);

+0 −8

Original line number	Diff line number	Diff line
		@@ -44,8 +44,6 @@ import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.phone.StatusBarIconControllerImpl;
		import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BatteryControllerImpl;
		import com.android.systemui.statusbar.policy.BluetoothController;
		import com.android.systemui.statusbar.policy.BluetoothControllerImpl;
		import com.android.systemui.statusbar.policy.CastController;
		@@ -176,12 +174,6 @@ public abstract class DependencyBinder {
		public abstract UserInfoController provideUserInfoContrller(
		UserInfoControllerImpl controllerImpl);

		/**
		*/
		@Binds
		public abstract BatteryController provideBatteryController(
		BatteryControllerImpl controllerImpl);

		/**
		*/
		@Binds

+7 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.ShadeControllerImpl;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.BatteryControllerImpl;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedControllerImpl;
		@@ -77,6 +79,11 @@ public abstract class SystemUIDefaultModule {
		abstract NotificationLockscreenUserManager bindNotificationLockscreenUserManager(
		NotificationLockscreenUserManagerImpl notificationLockscreenUserManager);

		@Binds
		@Singleton
		public abstract BatteryController provideBatteryController(
		BatteryControllerImpl controllerImpl);

		@Binds
		abstract DockManager bindDockManager(DockManagerImpl dockManager);

+9 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,12 @@ public interface BatteryController extends DemoMode, Dumpable,
		*/
		boolean isAodPowerSave();

		/**
		* Set reverse state.
		* @param isReverse true if turn on reverse, false otherwise
		*/
		default void setReverseState(boolean isReverse) {}

		/**
		* A listener that will be notified whenever a change in battery level or power save mode has
		* occurred.
		@@ -63,6 +69,9 @@ public interface BatteryController extends DemoMode, Dumpable,

		default void onPowerSaveChanged(boolean isPowerSave) {
		}

		default void onReverseChanged(boolean isReverse, int level, String name) {
		}
		}

		/**

+3 −3

Original line number	Diff line number	Diff line
		@@ -59,13 +59,13 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC

		private final EnhancedEstimates mEstimates;
		private final BroadcastDispatcher mBroadcastDispatcher;
		private final ArrayList<BatteryController.BatteryStateChangeCallback>
		protected final ArrayList<BatteryController.BatteryStateChangeCallback>
		mChangeCallbacks = new ArrayList<>();
		private final ArrayList<EstimateFetchCompletion> mFetchCallbacks = new ArrayList<>();
		private final PowerManager mPowerManager;
		private final Handler mMainHandler;
		private final Handler mBgHandler;
		private final Context mContext;
		protected final Context mContext;

		private int mLevel;
		private boolean mPluggedIn;
		@@ -80,7 +80,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC

		@VisibleForTesting
		@Inject
		BatteryControllerImpl(Context context, EnhancedEstimates enhancedEstimates,
		protected BatteryControllerImpl(Context context, EnhancedEstimates enhancedEstimates,
		PowerManager powerManager, BroadcastDispatcher broadcastDispatcher,
		@Main Handler mainHandler, @Background Handler bgHandler) {
		mContext = context;