Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ba6769 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27433927']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27433927'] into sparse-11866970-L36500030003915209.
SPARSE_CHANGE: I2bf9452009b2782fda343631b7fdb8c493758fa1

Change-Id: I7611e6cc75ed6a3167fca0726ba63fc8c4e885b4
parents cac9ee92 a23b9d28

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 }