From 5393c97866e3aff2099c578ac64b3e2022825586 Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Tue, 11 Jul 2023 13:17:32 -0700 Subject: [PATCH] Fix BP face icon being clickable with no action Prevent BP face icon from being clicked when there is no action for it. Prevents talkback, voice access, and switch access prompting interactions. Fixes: 289009872 Fixes: 289013029 Fixes: 289012229 Test: Tested manually following steps in b/289009872 Change-Id: Ica37af0839127bc3846afde5db04f013302c122c --- .../systemui/biometrics/ui/binder/BiometricViewBinder.kt | 4 ++++ 1 file changed, 4 insertions(+) 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 6a7431e540341..dc7347546c315 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 @@ object BiometricViewBinder { .collect { onClick -> iconViewOverlay.setOnClickListener(onClick) iconView.setOnClickListener(onClick) + if (onClick == null) { + iconViewOverlay.isClickable = false + iconView.isClickable = false + } } }