From cca6b39f3d3421bbd57c9796222662b33c9932db Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Thu, 26 Jan 2023 14:56:40 -0800 Subject: [PATCH] Disable FLAG_WATCH_OUTSIDE_TOUCH for new touch detection Fixes new expanded overlay not working on master. Causes some issues with alternate bouncer consuming touches first (b/262449405) Bug: 265455206 Test: atest SystemUITests:com.android.systemui.biometrics Change-Id: Ife87b91dad7322702d6020a0b98e5a3bf4b2ec62 --- .../com/android/systemui/biometrics/UdfpsControllerOverlay.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt index b4b3fae41710f..f2a0a336dc3c2 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt @@ -440,7 +440,8 @@ class UdfpsControllerOverlay @JvmOverloads constructor( ): WindowManager.LayoutParams { val paddingX = animation?.paddingX ?: 0 val paddingY = animation?.paddingY ?: 0 - if (animation != null && animation.listenForTouchesOutsideView()) { + if (!featureFlags.isEnabled(Flags.UDFPS_NEW_TOUCH_DETECTION) && animation != null && + animation.listenForTouchesOutsideView()) { flags = flags or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH }