Invert some InputConfig flags to simplify default behavior
Invert NOT_TOUCH_MODAL to TOUCH_MODAL, and SPLIT_TOUCH to
PREVENT_SPLITTING. Modal windows and windows that prevent splitting are
exceptional behaviors, so we make sure that these show up when
outputting flag values using ftl::Flags::string().
Bug: 216806304
Test: atest inputflinger_tests
Change-Id: I7cadcc830f06ff0c63da3b61a1a7580cb031f0c2
diff --git a/libs/gui/WindowInfo.cpp b/libs/gui/WindowInfo.cpp
index 2c25e7e..80bd638 100644
--- a/libs/gui/WindowInfo.cpp
+++ b/libs/gui/WindowInfo.cpp
@@ -47,7 +47,7 @@
}
bool WindowInfo::supportsSplitTouch() const {
- return inputConfig.test(InputConfig::SPLIT_TOUCH);
+ return !inputConfig.test(InputConfig::PREVENT_SPLITTING);
}
bool WindowInfo::isSpy() const {
diff --git a/libs/gui/include/gui/WindowInfo.h b/libs/gui/include/gui/WindowInfo.h
index 1b3419a..c8d4986 100644
--- a/libs/gui/include/gui/WindowInfo.h
+++ b/libs/gui/include/gui/WindowInfo.h
@@ -164,8 +164,8 @@
NOT_VISIBLE = 1 << 0,
NOT_FOCUSABLE = 1 << 1,
NOT_TOUCHABLE = 1 << 2,
- NOT_TOUCH_MODAL = 1 << 3,
- SPLIT_TOUCH = 1 << 4,
+ TOUCH_MODAL = 1 << 3,
+ PREVENT_SPLITTING = 1 << 4,
DUPLICATE_TOUCH_TO_WALLPAPER = 1 << 5,
IS_WALLPAPER = 1 << 6,
PAUSE_DISPATCHING = 1 << 7,
diff --git a/libs/gui/tests/EndToEndNativeInputTest.cpp b/libs/gui/tests/EndToEndNativeInputTest.cpp
index 1151aa3..fcfe21b 100644
--- a/libs/gui/tests/EndToEndNativeInputTest.cpp
+++ b/libs/gui/tests/EndToEndNativeInputTest.cpp
@@ -268,9 +268,6 @@
mInputInfo.name = "Test info";
mInputInfo.dispatchingTimeout = 5s;
mInputInfo.globalScaleFactor = 1.0;
- mInputInfo.setInputConfig(WindowInfo::InputConfig::NOT_TOUCH_MODAL, true);
- mInputInfo.setInputConfig(WindowInfo::InputConfig::NOT_VISIBLE, false);
-
mInputInfo.touchableRegion.orSelf(Rect(0, 0, width, height));
InputApplicationInfo aInfo;