summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2024-07-26 20:27:41 +0000
committer Beverly Tai <beverlyt@google.com> 2024-07-26 21:25:45 +0000
commit14b3cc4f44ed57d17a075edbd751aac1c987a59f (patch)
tree43ff1df635378227f04786641ea352aae3565b3d
parente32053c0f782444aaaa6a852590b81fce7a1484c (diff)
If deviceEntryIconView isn't visible, clickable=false
In general, the device entry icon view should still be clickable for switch access users when it is visible. Bug: 341916203 Flag: EXEMPT bugfix Test: on a UDFPS device, swipe down on the home screen in the UDFPS icon area. Notice that the notification shade can expand from this location. Change-Id: I151b989dde4f585f2c429c3436bb7307feb58234
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt12
1 files changed, 10 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
index 1b9788f2d401..4ac016e0ca1d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
@@ -74,8 +74,15 @@ object DeviceEntryIconViewBinder {
val bgView = view.bgView
longPressHandlingView.listener =
object : LongPressHandlingView.Listener {
- override fun onLongPressDetected(view: View, x: Int, y: Int, isA11yAction: Boolean) {
- if (!isA11yAction && falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) {
+ override fun onLongPressDetected(
+ view: View,
+ x: Int,
+ y: Int,
+ isA11yAction: Boolean
+ ) {
+ if (
+ !isA11yAction && falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)
+ ) {
return
}
vibratorHelper.performHapticFeedback(
@@ -95,6 +102,7 @@ object DeviceEntryIconViewBinder {
launch("$TAG#viewModel.isVisible") {
viewModel.isVisible.collect { isVisible ->
longPressHandlingView.isInvisible = !isVisible
+ view.isClickable = isVisible
}
}
launch("$TAG#viewModel.isLongPressEnabled") {