Merge "Introduce concept of DockUser" into tm-qpr-dev (dbd88822) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -10309,11 +10309,11 @@ public final class Settings {
		public static final String QS_AUTO_ADDED_TILES = "qs_auto_tiles";

		/**
		* The duration of timeout, in milliseconds, to switch from a non-primary user to the
		* primary user when the device is docked.
		* The duration of timeout, in milliseconds, to switch from a non-Dock User to the
		* Dock User when the device is docked.
		* @hide
		*/
		public static final String TIMEOUT_TO_USER_ZERO = "timeout_to_user_zero";
		public static final String TIMEOUT_TO_DOCK_USER = "timeout_to_dock_user";

		/**
		* Backup manager behavioral parameters.

core/res/res/values/config.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -2477,8 +2477,8 @@
		<integer name="config_dreamsBatteryLevelDrainCutoff">5</integer>
		<!-- Limit of how long the device can remain unlocked due to attention checking. -->
		<integer name="config_attentionMaximumExtension">900000</integer> <!-- 15 minutes. -->
		<!-- Is the system user the only user allowed to dream. -->
		<bool name="config_dreamsOnlyEnabledForSystemUser">false</bool>
		<!-- Whether there is to be a chosen Dock User who is the only user allowed to dream. -->
		<bool name="config_dreamsOnlyEnabledForDockUser">false</bool>
		<!-- Whether dreams are disabled when ambient mode is suppressed. -->
		<bool name="config_dreamsDisabledByAmbientModeSuppressionConfig">false</bool>

		@@ -2716,9 +2716,9 @@
		will be locked. -->
		<bool name="config_multiuserDelayUserDataLocking">false</bool>

		<!-- Whether to automatically switch a non-primary user back to the primary user after a
		timeout when the device is docked. -->
		<bool name="config_enableTimeoutToUserZeroWhenDocked">false</bool>
		<!-- Whether to automatically switch to the designated Dock User (the user chosen for
		displaying dreams, etc.) after a timeout when the device is docked. -->
		<bool name="config_enableTimeoutToDockUserWhenDocked">false</bool>

		<!-- Whether to only install system packages on a user if they're allowlisted for that user
		type. These are flags and can be freely combined.

core/res/res/values/symbols.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -466,7 +466,7 @@
		<java-symbol type="integer" name="config_multiuserMaximumUsers" />
		<java-symbol type="integer" name="config_multiuserMaxRunningUsers" />
		<java-symbol type="bool" name="config_multiuserDelayUserDataLocking" />
		<java-symbol type="bool" name="config_enableTimeoutToUserZeroWhenDocked" />
		<java-symbol type="bool" name="config_enableTimeoutToDockUserWhenDocked" />
		<java-symbol type="integer" name="config_userTypePackageWhitelistMode"/>
		<java-symbol type="xml" name="config_user_types" />
		<java-symbol type="integer" name="config_safe_media_volume_index" />
		@@ -2235,7 +2235,7 @@
		<java-symbol type="integer" name="config_dreamsBatteryLevelDrainCutoff" />
		<java-symbol type="string" name="config_dreamsDefaultComponent" />
		<java-symbol type="bool" name="config_dreamsDisabledByAmbientModeSuppressionConfig" />
		<java-symbol type="bool" name="config_dreamsOnlyEnabledForSystemUser" />
		<java-symbol type="bool" name="config_dreamsOnlyEnabledForDockUser" />
		<java-symbol type="integer" name="config_dreamOpenAnimationDuration" />
		<java-symbol type="integer" name="config_dreamCloseAnimationDuration" />
		<java-symbol type="array" name="config_supportedDreamComplications" />

packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import dagger.Provides;
		DreamOverlayComponent.class,
		})
		public interface DreamModule {
		String DREAM_ONLY_ENABLED_FOR_SYSTEM_USER = "dream_only_enabled_for_system_user";
		String DREAM_ONLY_ENABLED_FOR_DOCK_USER = "dream_only_enabled_for_dock_user";

		String DREAM_SUPPORTED = "dream_supported";

		@@ -70,10 +70,10 @@ public interface DreamModule {

		/** */
		@Provides
		@Named(DREAM_ONLY_ENABLED_FOR_SYSTEM_USER)
		static boolean providesDreamOnlyEnabledForSystemUser(@Main Resources resources) {
		@Named(DREAM_ONLY_ENABLED_FOR_DOCK_USER)
		static boolean providesDreamOnlyEnabledForDockUser(@Main Resources resources) {
		return resources.getBoolean(
		com.android.internal.R.bool.config_dreamsOnlyEnabledForSystemUser);
		com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
		}

		/** */

packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> {
		private final SettingObserver mDreamSettingObserver;
		private final UserTracker mUserTracker;
		private final boolean mDreamSupported;
		private final boolean mDreamOnlyEnabledForSystemUser;
		private final boolean mDreamOnlyEnabledForDockUser;

		private boolean mIsDocked = false;

		@@ -100,8 +100,8 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> {
		BroadcastDispatcher broadcastDispatcher,
		UserTracker userTracker,
		@Named(DreamModule.DREAM_SUPPORTED) boolean dreamSupported,
		@Named(DreamModule.DREAM_ONLY_ENABLED_FOR_SYSTEM_USER)
		boolean dreamOnlyEnabledForSystemUser
		@Named(DreamModule.DREAM_ONLY_ENABLED_FOR_DOCK_USER)
		boolean dreamOnlyEnabledForDockUser
		) {
		super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,
		statusBarStateController, activityStarter, qsLogger);
		@@ -123,7 +123,7 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> {
		};
		mUserTracker = userTracker;
		mDreamSupported = dreamSupported;
		mDreamOnlyEnabledForSystemUser = dreamOnlyEnabledForSystemUser;
		mDreamOnlyEnabledForDockUser = dreamOnlyEnabledForDockUser;
		}

		@Override
		@@ -203,7 +203,8 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> {
		// For now, restrict to debug users.
		return Build.isDebuggable()
		&& mDreamSupported
		&& (!mDreamOnlyEnabledForSystemUser \|\| mUserTracker.getUserHandle().isSystem());
		// TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
		&& (!mDreamOnlyEnabledForDockUser \|\| mUserTracker.getUserHandle().isSystem());
		}

		@VisibleForTesting