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

Commit 31a266d5 authored May 18, 2020 by Fabian Kozynski

Add multi-user support for AutoTileManager

Before this CL, AutoTileManager (and AutoAddTracker) would only work
"corectly" for user 0, as all the settings (read and write) were done in
user 0. This meant that tiles that got auto added as user 0 would not be
auto-added for other users. Similarly, tiles that got auto added as a
secondary user would not be auto added as user 0.

This CL makes sure that everything is done with respect to the current
user (as reported by QSTileHost).

Test: manual
Test: atest AutoTileManagerTest AutoAddTrackerTest
Bug: 154607890
Change-Id: I518334cca0a0960e0b3b74b43ac9fce4610c7bd0
Merged-In: I518334cca0a0960e0b3b74b43ac9fce4610c7bd0
(cherry picked from commit 1b5d7afb)

parent 5ef12162

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.systemui.plugins.qs.QSFactory;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.power.EnhancedEstimates;
		import com.android.systemui.power.EnhancedEstimatesImpl;
		import com.android.systemui.qs.dagger.QSModule;
		import com.android.systemui.qs.tileimpl.QSFactoryImpl;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.RecentsImplementation;
		@@ -74,7 +75,7 @@ import dagger.Binds;
		import dagger.Module;
		import dagger.Provides;

		@Module(includes = {DividerModule.class})
		@Module(includes = {DividerModule.class, QSModule.class})
		public abstract class CarSystemUIModule {

		@Singleton

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsBindingController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.content.ComponentName
		import android.service.controls.Control
		import android.service.controls.ControlsProviderService
		import android.service.controls.actions.ControlAction
		import com.android.systemui.controls.UserAwareController
		import com.android.systemui.util.UserAwareController
		import java.util.function.Consumer

		/**

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsController.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.service.controls.Control
		import android.service.controls.ControlsProviderService
		import android.service.controls.actions.ControlAction
		import com.android.systemui.controls.ControlStatus
		import com.android.systemui.controls.UserAwareController
		import com.android.systemui.util.UserAwareController
		import com.android.systemui.controls.management.ControlsFavoritingActivity
		import com.android.systemui.controls.ui.ControlsUiController
		import java.util.function.Consumer

packages/SystemUI/src/com/android/systemui/controls/management/ControlsListingController.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.systemui.controls.management

		import android.content.ComponentName
		import com.android.systemui.controls.ControlsServiceInfo
		import com.android.systemui.controls.UserAwareController
		import com.android.systemui.util.UserAwareController
		import com.android.systemui.statusbar.policy.CallbackController

		/**

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.systemui.plugins.qs.QSFactory;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.power.EnhancedEstimates;
		import com.android.systemui.power.EnhancedEstimatesImpl;
		import com.android.systemui.qs.dagger.QSModule;
		import com.android.systemui.qs.tileimpl.QSFactoryImpl;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.RecentsImplementation;
		@@ -70,7 +71,7 @@ import dagger.Provides;
		* A dagger module for injecting default implementations of components of System UI that may be
		* overridden by the System UI implementation.
		*/
		@Module(includes = {DividerModule.class})
		@Module(includes = {DividerModule.class, QSModule.class})
		public abstract class SystemUIDefaultModule {

		@Singleton