Merge "[flexiglass] Fixes crashloop." into main (307aaca0) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -249,7 +249,7 @@ constructor(
	val isKeyguardGoingAway: Flow<Boolean> = repository.isKeyguardGoingAway		val isKeyguardGoingAway: Flow<Boolean> = repository.isKeyguardGoingAway

	/** Keyguard can be clipped at the top as the shade is dragged */		/** Keyguard can be clipped at the top as the shade is dragged */
	val topClippingBounds: Flow<Int?> =		val topClippingBounds: Flow<Int?> by lazy {
	combineTransform(		combineTransform(
	keyguardTransitionInteractor		keyguardTransitionInteractor
	.transitionValue(scene = Scenes.Gone, stateWithoutSceneContainer = GONE)		.transitionValue(scene = Scenes.Gone, stateWithoutSceneContainer = GONE)
	@@ -263,6 +263,7 @@ constructor(
	}		}
	}		}
	.distinctUntilChanged()		.distinctUntilChanged()
			}

	/** Last point that [KeyguardRootView] view was tapped */		/** Last point that [KeyguardRootView] view was tapped */
	val lastRootViewTapPosition: Flow<Point?> = repository.lastRootViewTapPosition.asStateFlow()		val lastRootViewTapPosition: Flow<Point?> = repository.lastRootViewTapPosition.asStateFlow()