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

Commit d1de37fd authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 265cf2e7: Merge "Fix getSwitchState." 

* commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef':
  Fix getSwitchState.
parents 295a5833 f079d0d3

include/ui/Input.h

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,15 @@ enum { 
    AKEY_EVENT_FLAG_START_TRACKING = 0x40000000

};



enum {

    /*

     * Indicates that an input device has switches.

     * This input source flag is hidden from the API because switches are only used by the system

     * and applications have no way to interact with them.

     */

    AINPUT_SOURCE_SWITCH = 0x80000000,

};



/*

 * Maximum number of pointers supported per motion event.

 * Smallest number of pointers is 1.

libs/ui/InputReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ SwitchInputMapper::~SwitchInputMapper() { 
}



uint32_t SwitchInputMapper::getSources() {

    return 0;

    return AINPUT_SOURCE_SWITCH;

}



void SwitchInputMapper::process(const RawEvent* rawEvent) {

libs/ui/tests/InputReader_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ TEST_F(SwitchInputMapperTest, GetSources) { 
    SwitchInputMapper* mapper = new SwitchInputMapper(mDevice);

    addMapperAndConfigure(mapper);



    ASSERT_EQ(uint32_t(0), mapper->getSources());

    ASSERT_EQ(uint32_t(AINPUT_SOURCE_SWITCH), mapper->getSources());

}



TEST_F(SwitchInputMapperTest, GetSwitchState) {