Merge changes I494078de,I65a8a830 into main (891a21c5) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -303,6 +303,11 @@ object Flags {
	@JvmField val MIGRATE_CLOCKS_TO_BLUEPRINT =		@JvmField val MIGRATE_CLOCKS_TO_BLUEPRINT =
	unreleasedFlag("migrate_clocks_to_blueprint")		unreleasedFlag("migrate_clocks_to_blueprint")

			/** Migrate KeyguardRootView to use composables. */
			// TODO(b/301969856): Tracking Bug.
			@JvmField val KEYGUARD_ROOT_VIEW_USE_COMPOSE =
			unreleasedFlag("keyguard_root_view_use_compose")

	/** Enables preview loading animation in the wallpaper picker. */		/** Enables preview loading animation in the wallpaper picker. */
	// TODO(b/274443705): Tracking Bug		// TODO(b/274443705): Tracking Bug
	@JvmField		@JvmField

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,6 @@ import com.android.keyguard.LockIconView
	import com.android.keyguard.LockIconViewController		import com.android.keyguard.LockIconViewController
	import com.android.keyguard.dagger.KeyguardStatusViewComponent		import com.android.keyguard.dagger.KeyguardStatusViewComponent
	import com.android.systemui.CoreStartable		import com.android.systemui.CoreStartable
	import com.android.systemui.res.R
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.flags.FeatureFlags		import com.android.systemui.flags.FeatureFlags
	import com.android.systemui.flags.Flags		import com.android.systemui.flags.Flags
	@@ -40,7 +39,9 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardBlueprintViewModel
	import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel		import com.android.systemui.keyguard.ui.viewmodel.KeyguardIndicationAreaViewModel
	import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel		import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
	import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel		import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel
			import com.android.systemui.res.R
	import com.android.systemui.shade.NotificationShadeWindowView		import com.android.systemui.shade.NotificationShadeWindowView
			import com.android.systemui.shade.domain.interactor.ShadeInteractor
	import com.android.systemui.statusbar.KeyguardIndicationController		import com.android.systemui.statusbar.KeyguardIndicationController
	import com.android.systemui.statusbar.policy.KeyguardStateController		import com.android.systemui.statusbar.policy.KeyguardStateController
	import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator		import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator
	@@ -69,6 +70,7 @@ constructor(
	private val context: Context,		private val context: Context,
	private val keyguardIndicationController: KeyguardIndicationController,		private val keyguardIndicationController: KeyguardIndicationController,
	private val lockIconViewController: LockIconViewController,		private val lockIconViewController: LockIconViewController,
			private val shadeInteractor: ShadeInteractor,
	) : CoreStartable {		) : CoreStartable {

	private var rootViewHandle: DisposableHandle? = null		private var rootViewHandle: DisposableHandle? = null
	@@ -135,6 +137,7 @@ constructor(
	occludingAppDeviceEntryMessageViewModel,		occludingAppDeviceEntryMessageViewModel,
	chipbarCoordinator,		chipbarCoordinator,
	keyguardStateController,		keyguardStateController,
			shadeInteractor
	)		)
	}		}

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import com.android.systemui.flags.Flags
	import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel		import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
	import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel		import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessageViewModel
	import com.android.systemui.lifecycle.repeatWhenAttached		import com.android.systemui.lifecycle.repeatWhenAttached
			import com.android.systemui.shade.domain.interactor.ShadeInteractor
	import com.android.systemui.statusbar.StatusBarState		import com.android.systemui.statusbar.StatusBarState
	import com.android.systemui.statusbar.policy.KeyguardStateController		import com.android.systemui.statusbar.policy.KeyguardStateController
	import com.android.systemui.temporarydisplay.ViewPriority		import com.android.systemui.temporarydisplay.ViewPriority
	@@ -55,6 +56,7 @@ object KeyguardRootViewBinder {
	occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,		occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,
	chipbarCoordinator: ChipbarCoordinator,		chipbarCoordinator: ChipbarCoordinator,
	keyguardStateController: KeyguardStateController,		keyguardStateController: KeyguardStateController,
			shadeInteractor: ShadeInteractor,
	): DisposableHandle {		): DisposableHandle {
	val disposableHandle =		val disposableHandle =
	view.repeatWhenAttached {		view.repeatWhenAttached {
	@@ -88,6 +90,17 @@ object KeyguardRootViewBinder {
	}		}
	}		}
	}		}

			launch {
			shadeInteractor.isAnyFullyExpanded.collect { isFullyAnyExpanded ->
			view.visibility =
			if (isFullyAnyExpanded) {
			View.INVISIBLE
			} else {
			View.VISIBLE
			}
			}
			}
	}		}

	repeatOnLifecycle(Lifecycle.State.STARTED) {		repeatOnLifecycle(Lifecycle.State.STARTED) {

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,7 @@ import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessage
	import com.android.systemui.monet.ColorScheme		import com.android.systemui.monet.ColorScheme
	import com.android.systemui.plugins.ClockController		import com.android.systemui.plugins.ClockController
	import com.android.systemui.plugins.FalsingManager		import com.android.systemui.plugins.FalsingManager
			import com.android.systemui.shade.domain.interactor.ShadeInteractor
	import com.android.systemui.shared.clocks.ClockRegistry		import com.android.systemui.shared.clocks.ClockRegistry
	import com.android.systemui.shared.clocks.DefaultClockController		import com.android.systemui.shared.clocks.DefaultClockController
	import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants		import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants
	@@ -109,6 +110,7 @@ constructor(
	private val occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,		private val occludingAppDeviceEntryMessageViewModel: OccludingAppDeviceEntryMessageViewModel,
	private val chipbarCoordinator: ChipbarCoordinator,		private val chipbarCoordinator: ChipbarCoordinator,
	private val keyguardStateController: KeyguardStateController,		private val keyguardStateController: KeyguardStateController,
			private val shadeInteractor: ShadeInteractor,
	) {		) {

	val hostToken: IBinder? = bundle.getBinder(KEY_HOST_TOKEN)		val hostToken: IBinder? = bundle.getBinder(KEY_HOST_TOKEN)
	@@ -317,6 +319,7 @@ constructor(
	occludingAppDeviceEntryMessageViewModel,		occludingAppDeviceEntryMessageViewModel,
	chipbarCoordinator,		chipbarCoordinator,
	keyguardStateController,		keyguardStateController,
			shadeInteractor,
	)		)
	)		)
	rootView.addView(		rootView.addView(

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeInteractor.kt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,9 @@ constructor(
	combine(shadeExpansion, qsExpansion) { shadeExp, qsExp -> maxOf(shadeExp, qsExp) }		combine(shadeExpansion, qsExpansion) { shadeExp, qsExp -> maxOf(shadeExp, qsExp) }
	.stateIn(scope, SharingStarted.Eagerly, 0f)		.stateIn(scope, SharingStarted.Eagerly, 0f)

			/** Whether either the shade or QS is fully expanded. */
			val isAnyFullyExpanded: Flow<Boolean> = anyExpansion.map { it >= 1f }.distinctUntilChanged()

	/** Whether either the shade or QS is expanding from a fully collapsed state. */		/** Whether either the shade or QS is expanding from a fully collapsed state. */
	val isAnyExpanding: Flow<Boolean> =		val isAnyExpanding: Flow<Boolean> =
	anyExpansion		anyExpansion