Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76bdecb0 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

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
parent dc70e405

libs/gui/WindowInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ bool WindowInfo::frameContainsPoint(int32_t x, int32_t y) const { 
}



bool WindowInfo::supportsSplitTouch() const {

    return inputConfig.test(InputConfig::SPLIT_TOUCH);

    return !inputConfig.test(InputConfig::PREVENT_SPLITTING);

}



bool WindowInfo::isSpy() const {

libs/gui/include/gui/WindowInfo.h

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ struct WindowInfo : public Parcelable { 
        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,

libs/gui/tests/EndToEndNativeInputTest.cpp

+0 −3
Original line number Diff line number Diff line
@@ -268,9 +268,6 @@ private: 
        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;

services/inputflinger/dispatcher/InputDispatcher.cpp

+2 −3
Original line number Diff line number Diff line
@@ -509,9 +509,8 @@ bool windowAcceptsTouchAt(const WindowInfo& windowInfo, int32_t displayId, int32 
    if (inputConfig.test(WindowInfo::InputConfig::NOT_TOUCHABLE) && !windowCanInterceptTouch) {

        return false;

    }

    const bool isModalWindow = !inputConfig.test(WindowInfo::InputConfig::NOT_FOCUSABLE) &&

            !inputConfig.test(WindowInfo::InputConfig::NOT_TOUCH_MODAL);

    if (!isModalWindow && !windowInfo.touchableRegionContainsPoint(x, y)) {

    if (!inputConfig.test(WindowInfo::InputConfig::TOUCH_MODAL) &&

        !windowInfo.touchableRegionContainsPoint(x, y)) {

        return false;

    }

    return true;

services/inputflinger/tests/InputDispatcher_test.cpp

+12 −93

File changed.

Preview size limit exceeded, changes collapsed.