From 2b5059fda74eaa21249a88c69855e61d921f5aa3 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Fri, 4 Feb 2022 08:34:57 -0800 Subject: [PATCH 1/2] Invert some InputConfig flags to simplify default behavior Bug: 216806304 Test: atest inputflinger_tests Change-Id: I0a2ca2727325b0eadda0af4b722e2c2ecae80890 --- .../jni/android_hardware_input_InputWindowHandle.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index a44c4e04a642d..2f5e68fce8cce 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -184,14 +184,14 @@ bool NativeInputWindowHandle::updateInfo() { mInfo.inputConfig |= InputConfig::NOT_TOUCHABLE; } FALLTHROUGH_INTENDED; - case InputConfig::NOT_TOUCH_MODAL: - if (flags.test(WindowInfo::Flag::NOT_TOUCH_MODAL)) { - mInfo.inputConfig |= InputConfig::NOT_TOUCH_MODAL; + case InputConfig::TOUCH_MODAL: + if (!flags.test(WindowInfo::Flag::NOT_TOUCH_MODAL)) { + mInfo.inputConfig |= InputConfig::TOUCH_MODAL; } FALLTHROUGH_INTENDED; - case InputConfig::SPLIT_TOUCH: - if (flags.test(WindowInfo::Flag::SPLIT_TOUCH)) { - mInfo.inputConfig |= InputConfig::SPLIT_TOUCH; + case InputConfig::PREVENT_SPLITTING: + if (!flags.test(WindowInfo::Flag::SPLIT_TOUCH)) { + mInfo.inputConfig |= InputConfig::PREVENT_SPLITTING; } FALLTHROUGH_INTENDED; case InputConfig::DUPLICATE_TOUCH_TO_WALLPAPER: From 1d2653febdb2ddbdf0ddae319e898737fd9b6b14 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Fri, 4 Feb 2022 09:29:24 -0800 Subject: [PATCH 2/2] Remove the concept of TOUCH_MODAL from input Bug: 216806304 Test: atest inputflinger_tests Change-Id: I9593865213216b420ab9b5c5b853298f01dabcc6 --- core/jni/android_hardware_input_InputWindowHandle.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index 2f5e68fce8cce..a4808ce4836af 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -184,11 +184,6 @@ bool NativeInputWindowHandle::updateInfo() { mInfo.inputConfig |= InputConfig::NOT_TOUCHABLE; } FALLTHROUGH_INTENDED; - case InputConfig::TOUCH_MODAL: - if (!flags.test(WindowInfo::Flag::NOT_TOUCH_MODAL)) { - mInfo.inputConfig |= InputConfig::TOUCH_MODAL; - } - FALLTHROUGH_INTENDED; case InputConfig::PREVENT_SPLITTING: if (!flags.test(WindowInfo::Flag::SPLIT_TOUCH)) { mInfo.inputConfig |= InputConfig::PREVENT_SPLITTING;