Merge changes from topics "usc-less-domain", "usc-less-split-flag",... (6e543ea6) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ import com.android.systemui.statusbar.policy.ZenModeController;
	import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule;		import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule;
	import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;		import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;
	import com.android.systemui.statusbar.window.StatusBarWindowModule;		import com.android.systemui.statusbar.window.StatusBarWindowModule;
			import com.android.systemui.telephony.data.repository.TelephonyRepositoryModule;
	import com.android.systemui.tuner.dagger.TunerModule;		import com.android.systemui.tuner.dagger.TunerModule;
	import com.android.systemui.unfold.SysUIUnfoldModule;		import com.android.systemui.unfold.SysUIUnfoldModule;
	import com.android.systemui.user.UserModule;		import com.android.systemui.user.UserModule;
	@@ -145,6 +146,7 @@ import dagger.Provides;
	StatusBarWindowModule.class,		StatusBarWindowModule.class,
	SysUIConcurrencyModule.class,		SysUIConcurrencyModule.class,
	SysUIUnfoldModule.class,		SysUIUnfoldModule.class,
			TelephonyRepositoryModule.class,
	TunerModule.class,		TunerModule.class,
	UserModule.class,		UserModule.class,
	UtilModule.class,		UtilModule.class,

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+20 −3

Original line number	Original line	Diff line number	Diff line
	@@ -104,9 +104,26 @@ public class Flags {
	public static final ReleasedFlag MODERN_USER_SWITCHER_ACTIVITY =		public static final ReleasedFlag MODERN_USER_SWITCHER_ACTIVITY =
	new ReleasedFlag(209, true);		new ReleasedFlag(209, true);

	/** Whether the new implementation of UserSwitcherController should be used. */		/**
	public static final UnreleasedFlag REFACTORED_USER_SWITCHER_CONTROLLER =		* Whether the user interactor and repository should use `UserSwitcherController`.
	new UnreleasedFlag(210, false);		*
			* <p>If this is {@code false}, the interactor and repo skip the controller and directly access
			* the framework APIs.
			*/
			public static final UnreleasedFlag USER_INTERACTOR_AND_REPO_USE_CONTROLLER =
			new UnreleasedFlag(210, true);

			/**
			* Whether `UserSwitcherController` should use the user interactor.
			*
			* <p>When this is {@code true}, the controller does not directly access framework APIs.
			* Instead, it goes through the interactor.
			*
			* <p>Note: do not set this to true if {@link #USER_INTERACTOR_AND_REPO_USE_CONTROLLER} is
			* {@code true} as it would created a cycle between controller -> interactor -> controller.
			*/
			public static final UnreleasedFlag USER_CONTROLLER_USES_INTERACTOR =
			new UnreleasedFlag(211, false);

	/***************************************/		/***************************************/
	// 300 - power menu		// 300 - power menu

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,15 @@ interface KeyguardRepository {
	*/		*/
	val dozeAmount: Flow<Float>		val dozeAmount: Flow<Float>

			/**
			* Returns `true` if the keyguard is showing; `false` otherwise.
			*
			* Note: this is also `true` when the lock-screen is occluded with an `Activity` "above" it in
			* the z-order (which is not really above the system UI window, but rather - the lock-screen
			* becomes invisible to reveal the "occluding activity").
			*/
			fun isKeyguardShowing(): Boolean

	/** Sets whether the bottom area UI should animate the transition out of doze state. */		/** Sets whether the bottom area UI should animate the transition out of doze state. */
	fun setAnimateDozingTransitions(animate: Boolean)		fun setAnimateDozingTransitions(animate: Boolean)

	@@ -103,7 +112,7 @@ class KeyguardRepositoryImpl
	@Inject		@Inject
	constructor(		constructor(
	statusBarStateController: StatusBarStateController,		statusBarStateController: StatusBarStateController,
	keyguardStateController: KeyguardStateController,		private val keyguardStateController: KeyguardStateController,
	dozeHost: DozeHost,		dozeHost: DozeHost,
	) : KeyguardRepository {		) : KeyguardRepository {
	private val _animateBottomAreaDozingTransitions = MutableStateFlow(false)		private val _animateBottomAreaDozingTransitions = MutableStateFlow(false)
	@@ -168,6 +177,10 @@ constructor(
	awaitClose { statusBarStateController.removeCallback(callback) }		awaitClose { statusBarStateController.removeCallback(callback) }
	}		}

			override fun isKeyguardShowing(): Boolean {
			return keyguardStateController.isShowing
			}

	override fun setAnimateDozingTransitions(animate: Boolean) {		override fun setAnimateDozingTransitions(animate: Boolean) {
	_animateBottomAreaDozingTransitions.value = animate		_animateBottomAreaDozingTransitions.value = animate
	}		}

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.Flow
	class KeyguardInteractor		class KeyguardInteractor
	@Inject		@Inject
	constructor(		constructor(
	repository: KeyguardRepository,		private val repository: KeyguardRepository,
	) {		) {
	/**		/**
	* The amount of doze the system is in, where `1.0` is fully dozing and `0.0` is not dozing at		* The amount of doze the system is in, where `1.0` is fully dozing and `0.0` is not dozing at
	@@ -40,4 +40,8 @@ constructor(
	val isDozing: Flow<Boolean> = repository.isDozing		val isDozing: Flow<Boolean> = repository.isDozing
	/** Whether the keyguard is showing ot not. */		/** Whether the keyguard is showing ot not. */
	val isKeyguardShowing: Flow<Boolean> = repository.isKeyguardShowing		val isKeyguardShowing: Flow<Boolean> = repository.isKeyguardShowing

			fun isKeyguardShowing(): Boolean {
			return repository.isKeyguardShowing()
			}
	}		}

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ public class UserDetailView extends PseudoGridView {
	v.bind(name, drawable, item.info.id);		v.bind(name, drawable, item.info.id);
	}		}
	v.setActivated(item.isCurrent);		v.setActivated(item.isCurrent);
	v.setDisabledByAdmin(mController.isDisabledByAdmin(item));		v.setDisabledByAdmin(item.isDisabledByAdmin());
	v.setEnabled(item.isSwitchToEnabled);		v.setEnabled(item.isSwitchToEnabled);
	UserSwitcherController.setSelectableAlpha(v);		UserSwitcherController.setSelectableAlpha(v);

	@@ -173,16 +173,16 @@ public class UserDetailView extends PseudoGridView {
	Trace.beginSection("UserDetailView.Adapter#onClick");		Trace.beginSection("UserDetailView.Adapter#onClick");
	UserRecord userRecord =		UserRecord userRecord =
	(UserRecord) view.getTag();		(UserRecord) view.getTag();
	if (mController.isDisabledByAdmin(userRecord)) {		if (userRecord.isDisabledByAdmin()) {
	final Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(		final Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(
	mContext, mController.getEnforcedAdmin(userRecord));		mContext, userRecord.enforcedAdmin);
	mController.startActivity(intent);		mController.startActivity(intent);
	} else if (userRecord.isSwitchToEnabled) {		} else if (userRecord.isSwitchToEnabled) {
	MetricsLogger.action(mContext, MetricsEvent.QS_SWITCH_USER);		MetricsLogger.action(mContext, MetricsEvent.QS_SWITCH_USER);
	mUiEventLogger.log(QSUserSwitcherEvent.QS_USER_SWITCH);		mUiEventLogger.log(QSUserSwitcherEvent.QS_USER_SWITCH);
	if (!userRecord.isAddUser		if (!userRecord.isAddUser
	&& !userRecord.isRestricted		&& !userRecord.isRestricted
	&& !mController.isDisabledByAdmin(userRecord)) {		&& !userRecord.isDisabledByAdmin()) {
	if (mCurrentUserView != null) {		if (mCurrentUserView != null) {
	mCurrentUserView.setActivated(false);		mCurrentUserView.setActivated(false);
	}		}