Merge "Do not expand/collapse shade after display move when flexiglass is off" into main (726116c4) · Commits · e / os / android_frameworks_base

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -110,15 +110,19 @@ constructor(
		@Background private val bgContext: CoroutineContext,
		) : ShadeElement() {
		override suspend fun expand(reason: String) {
		if (SceneContainerFlag.isEnabled) {
		shadeInteractor.expandNotificationsShade(reason)
		shadeInteractor.shadeExpansion.waitUntil(1f, bgContext)
		}
		}

		override suspend fun collapse(reason: String) {
		if (SceneContainerFlag.isEnabled) {
		shadeInteractor.collapseNotificationsShade(reason)
		shadeInteractor.shadeExpansion.waitUntil(0f, bgContext)
		}
		}
		}

		@SysUISingleton
		class QSShadeElement
		@@ -128,12 +132,16 @@ constructor(
		@Background private val bgContext: CoroutineContext,
		) : ShadeElement() {
		override suspend fun expand(reason: String) {
		if (SceneContainerFlag.isEnabled) {
		shadeInteractor.expandQuickSettingsShade(reason)
		shadeInteractor.qsExpansion.waitUntil(1f, bgContext)
		}
		}

		override suspend fun collapse(reason: String) {
		if (SceneContainerFlag.isEnabled) {
		shadeInteractor.collapseQuickSettingsShade(reason)
		shadeInteractor.qsExpansion.waitUntil(0f, bgContext)
		}
		}
		}