Merge changes from topics "invert-some-inputconfig", "rm-touch-modal"

* changes:
  Remove the concept of TOUCH_MODAL from input
  Invert some InputConfig flags to simplify default behavior
This commit is contained in:
TreeHugger Robot
2022-02-15 18:44:07 +00:00
committed by Android (Google) Code Review

View File

@@ -185,14 +185,9 @@ 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;
}
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: