Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix getSwitchState."

Browse Source
This commit is contained in:
Jeff Brown
2011-01-22 21:23:19 -08:00
committed by Android Code Review
parent 35f4d32dc2 3d822cda1e
commit 265cf2e76b
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/ui/Input.h
View File

@@ -38,6 +38,15 @@ enum {
AKEY_EVENT_FLAG_START_TRACKING = 0x40000000 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. * Maximum number of pointers supported per motion event.
* Smallest number of pointers is 1. * Smallest number of pointers is 1.

2
libs/ui/InputReader.cpp
View File

@@ -806,7 +806,7 @@ SwitchInputMapper::~SwitchInputMapper() {
} }
uint32_t SwitchInputMapper::getSources() { uint32_t SwitchInputMapper::getSources() {
return 0; return AINPUT_SOURCE_SWITCH;
} }
void SwitchInputMapper::process(const RawEvent* rawEvent) { void SwitchInputMapper::process(const RawEvent* rawEvent) {

2
libs/ui/tests/InputReader_test.cpp
View File

@@ -1356,7 +1356,7 @@ TEST_F(SwitchInputMapperTest, GetSources) {
SwitchInputMapper* mapper = new SwitchInputMapper(mDevice); SwitchInputMapper* mapper = new SwitchInputMapper(mDevice);
addMapperAndConfigure(mapper); addMapperAndConfigure(mapper);
ASSERT_EQ(uint32_t(0), mapper->getSources()); ASSERT_EQ(uint32_t(AINPUT_SOURCE_SWITCH), mapper->getSources());
} }
TEST_F(SwitchInputMapperTest, GetSwitchState) { TEST_F(SwitchInputMapperTest, GetSwitchState) {