drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6ca90042: Add touch.wake IDC property to control wakeup.

Browse Source 
* commit '6ca90042b398153e063cf69dea784e201e76a9ee':
  Add touch.wake IDC property to control wakeup.
This commit is contained in:
Jeff Brown
2014-02-27 01:59:02 +00:00
committed by Android Git Automerger
parent 74a8b916ac 6ca90042b3
commit 71e21fec61
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/input/InputReader.cpp
View File

@ -2831,6 +2831,13 @@ void TouchInputMapper::configureParameters() {
mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_SCREEN
&& getDevice()->isExternal();
}
// Initial downs on external touch devices should wake the device.
// Normally we don't do this for internal touch screens to prevent them from waking
// up in your pocket but you can enable it using the input device configuration.
mParameters.wake = getDevice()->isExternal();
getDevice()->getConfiguration().tryGetProperty(String8("touch.wake"),
mParameters.wake);
}
void TouchInputMapper::dumpParameters(String8& dump) {
@ -3733,11 +3740,7 @@ void TouchInputMapper::sync(nsecs_t when) {
getContext()->fadePointer();
}
// Initial downs on external touch devices should wake the device.
// We don't do this for internal touch screens to prevent them from waking
// up in your pocket.
// TODO: Use the input device configuration to control this behavior more finely.
if (getDevice()->isExternal()) {
if (mParameters.wake) {
policyFlags |= POLICY_FLAG_WAKE_DROPPED;
}
}

2
libs/input/InputReader.h
View File

@ -1214,6 +1214,8 @@ protected:
GESTURE_MODE_SPOTS,
};
GestureMode gestureMode;
bool wake;
} mParameters;
// Immutable calibration parameters in parsed form.