Merge cherrypicks of ['googleplex-android-review.googlesource.com/27433927'] into 24Q3-release. (4d8f3ea0) · Commits · e / os / android_frameworks_base

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

+21 −14

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

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