commit e43400a9b13863ea135ab905db69a6fcf63ebd87
author Austin Delgado <austindelgado@google.com> Tue Jul 25 18:52:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 18:52:14 2023 +0000
tree ab4118a340771619d17d3a267d6db849ab7ecbeb
parent 04158cf768ab2c41b4ab92633a4bef5b3f1a27d5
parent 5393c97866e3aff2099c578ac64b3e2022825586

Merge "Fix BP face icon being clickable with no action" into udc-d1-dev

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
index e5a4d1a..4e26601 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt
@@ -305,6 +305,10 @@
                         .collect { onClick ->
                             iconViewOverlay.setOnClickListener(onClick)
                             iconView.setOnClickListener(onClick)
+                            if (onClick == null) {
+                                iconViewOverlay.isClickable = false
+                                iconView.isClickable = false
+                            }
                         }
                 }