Merge "Remove stateIn from buttons in shortcuts combined view model" into main (15ba8f25) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt

+0 −16

Original line number	Diff line number	Diff line
		@@ -179,14 +179,6 @@ constructor(
		} else {
		button(KeyguardQuickAffordancePosition.BOTTOM_START)
		}
		.stateIn(
		scope = applicationScope,
		started = SharingStarted.Eagerly,
		initialValue =
		KeyguardQuickAffordanceViewModel(
		slotId = KeyguardQuickAffordancePosition.BOTTOM_START.toSlotId()
		),
		)

		/** An observable for the view-model of the "end button" quick affordance. */
		val endButton: Flow<KeyguardQuickAffordanceViewModel> =
		@@ -200,14 +192,6 @@ constructor(
		} else {
		button(KeyguardQuickAffordancePosition.BOTTOM_END)
		}
		.stateIn(
		scope = applicationScope,
		started = SharingStarted.Eagerly,
		initialValue =
		KeyguardQuickAffordanceViewModel(
		slotId = KeyguardQuickAffordancePosition.BOTTOM_END.toSlotId()
		),
		)

		/**
		* Notifies that a slot with the given ID has been selected in the preview experience that is