Merge "On registerForDismissGestures coroutine completion, unregister for... (5235e319) · Commits · e / os / android_frameworks_base

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

+21 −14

Original line number	Diff line number	Diff line
		@@ -190,8 +190,9 @@ constructor(
		launch("$TAG#viewModel.registerForDismissGestures") {
		viewModel.registerForDismissGestures.collect { registerForDismissGestures ->
		if (registerForDismissGestures) {
		swipeUpAnywhereGestureHandler.addOnGestureDetectedCallback(swipeTag) { _
		->
		swipeUpAnywhereGestureHandler.addOnGestureDetectedCallback(
		swipeTag
		) { _ ->
		alternateBouncerDependencies.powerInteractor.onUserTouch()
		viewModel.showPrimaryBouncer()
		}
		@@ -200,11 +201,17 @@ constructor(
		viewModel.showPrimaryBouncer()
		}
		} else {
		swipeUpAnywhereGestureHandler.removeOnGestureDetectedCallback(swipeTag)
		swipeUpAnywhereGestureHandler.removeOnGestureDetectedCallback(
		swipeTag
		)
		tapGestureDetector.removeOnGestureDetectedCallback(tapTag)
		}
		}
		}
		.invokeOnCompletion {
		swipeUpAnywhereGestureHandler.removeOnGestureDetectedCallback(swipeTag)
		tapGestureDetector.removeOnGestureDetectedCallback(tapTag)
		}

		launch("$TAG#viewModel.scrimAlpha") {
		viewModel.scrimAlpha.collect { scrim.viewAlpha = it }