Merge "[flexiglass] SceneContainerFlags." into main (9dbc7bee) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac
		import com.android.systemui.log.SessionTracker;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.scene.shared.flag.SceneContainerFlags;
		import com.android.systemui.shared.system.SysUiStatsLog;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController;
		@@ -123,6 +124,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		private final UserSwitcherController mUserSwitcherController;
		private final GlobalSettings mGlobalSettings;
		private final FeatureFlags mFeatureFlags;
		private final SceneContainerFlags mSceneContainerFlags;
		private final SessionTracker mSessionTracker;
		private final Optional<SideFpsController> mSideFpsController;
		private final FalsingA11yDelegate mFalsingA11yDelegate;
		@@ -433,6 +435,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		FalsingManager falsingManager,
		UserSwitcherController userSwitcherController,
		FeatureFlags featureFlags,
		SceneContainerFlags sceneContainerFlags,
		GlobalSettings globalSettings,
		SessionTracker sessionTracker,
		Optional<SideFpsController> sideFpsController,
		@@ -466,6 +469,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		mFalsingManager = falsingManager;
		mUserSwitcherController = userSwitcherController;
		mFeatureFlags = featureFlags;
		mSceneContainerFlags = sceneContainerFlags;
		mGlobalSettings = globalSettings;
		mSessionTracker = sessionTracker;
		mSideFpsController = sideFpsController;
		@@ -503,7 +507,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard

		showPrimarySecurityScreen(false);

		if (mFeatureFlags.isEnabled(Flags.SCENE_CONTAINER)) {
		if (mSceneContainerFlags.isEnabled()) {
		// When the scene framework says that the lockscreen has been dismissed, dismiss the
		// keyguard here, revealing the underlying app or launcher:
		mSceneTransitionCollectionJob = mJavaAdapter.get().alwaysCollectFlow(

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -26,9 +26,8 @@ import com.android.systemui.classifier.FalsingClassifier
		import com.android.systemui.classifier.domain.interactor.FalsingInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.scene.domain.interactor.SceneInteractor
		import com.android.systemui.scene.shared.flag.SceneContainerFlags
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.shared.model.SceneModel
		import com.android.systemui.util.kotlin.pairwise
		@@ -51,7 +50,7 @@ constructor(
		private val repository: BouncerRepository,
		private val authenticationInteractor: AuthenticationInteractor,
		private val sceneInteractor: SceneInteractor,
		featureFlags: FeatureFlags,
		flags: SceneContainerFlags,
		private val falsingInteractor: FalsingInteractor,
		) {

		@@ -94,7 +93,7 @@ constructor(
		val isPatternVisible: StateFlow<Boolean> = authenticationInteractor.isPatternVisible

		init {
		if (featureFlags.isEnabled(Flags.SCENE_CONTAINER)) {
		if (flags.isEnabled()) {
		// Clear the message if moved from throttling to no-longer throttling.
		applicationScope.launch {
		isThrottled.pairwise().collect { (wasThrottled, currentlyThrottled) ->

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerViewModel.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -23,8 +23,7 @@ import com.android.systemui.authentication.domain.model.AuthenticationMethodMode
		import com.android.systemui.bouncer.domain.interactor.BouncerInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.scene.shared.flag.SceneContainerFlags
		import javax.inject.Inject
		import kotlin.math.ceil
		import kotlinx.coroutines.CoroutineScope
		@@ -47,7 +46,7 @@ constructor(
		@Application private val applicationScope: CoroutineScope,
		private val bouncerInteractor: BouncerInteractor,
		private val authenticationInteractor: AuthenticationInteractor,
		featureFlags: FeatureFlags,
		flags: SceneContainerFlags,
		) {
		private val isInputEnabled: StateFlow<Boolean> =
		bouncerInteractor.isThrottled
		@@ -102,7 +101,7 @@ constructor(
		)

		init {
		if (featureFlags.isEnabled(Flags.SCENE_CONTAINER)) {
		if (flags.isEnabled()) {
		applicationScope.launch {
		bouncerInteractor.isThrottled
		.map { isThrottled ->

packages/SystemUI/src/com/android/systemui/classifier/FalsingModule.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@ import android.view.ViewConfiguration;
		import com.android.systemui.R;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.flags.FeatureFlagsClassic;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.scene.shared.flag.SceneContainerFlags;
		import com.android.systemui.statusbar.phone.NotificationTapHelper;

		import dagger.Binds;
		@@ -53,8 +52,8 @@ public interface FalsingModule {
		static FalsingCollector providesFalsingCollectorLegacy(
		FalsingCollectorImpl impl,
		FalsingCollectorNoOp noOp,
		FeatureFlagsClassic featureFlags) {
		return featureFlags.isEnabled(Flags.SCENE_CONTAINER) ? noOp : impl;
		SceneContainerFlags flags) {
		return flags.isEnabled() ? noOp : impl;
		}

		/** Provides the actual {@link FalsingCollector}. */

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,18 @@ object Flags {
		*/
		// TODO(b/283300105): Tracking Bug
		@JvmField val SCENE_CONTAINER_ENABLED = false
		@Deprecated(
		message = """
		Do not use this flag directly. Please use
		[com.android.systemui.scene.shared.flag.SceneContainerFlags#isEnabled].

		(Not really deprecated but using this as a simple way to bring attention to the above).
		""",
		replaceWith = ReplaceWith(
		"com.android.systemui.scene.shared.flag.SceneContainerFlags#isEnabled",
		),
		level = DeprecationLevel.WARNING,
		)
		@JvmField val SCENE_CONTAINER = unreleasedFlag("scene_container")

		// 1900