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

Commit 8b9df978 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix getSwitchState." into honeycomb

parents af3227ff 89de57a8

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.

services/input/InputReader.cpp

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



uint32_t SwitchInputMapper::getSources() {

    return 0;

    return AINPUT_SOURCE_SWITCH;

}



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

services/input/tests/InputReader_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1484,7 +1484,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) {