summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-08-30 18:29:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 18:29:12 -0700
commit22f5ee93746f37823265b8cb9b1e94e572607514 (patch)
tree269e105935875e8453c0bd33792fdeedd4c928ee /native
parent02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd (diff)
parent36f0cb26cbb4ef62995ff2e5a540cf8814e7f030 (diff)
downloadframeworks_base-22f5ee93746f37823265b8cb9b1e94e572607514.zip
frameworks_base-22f5ee93746f37823265b8cb9b1e94e572607514.tar.gz
frameworks_base-22f5ee93746f37823265b8cb9b1e94e572607514.tar.bz2
am 36f0cb26: am 8d60866e: Input device calibration and capabilities.
Merge commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030' * commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030': Input device calibration and capabilities.
Diffstat (limited to 'native')
-rw-r--r--native/include/android/input.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/native/include/android/input.h b/native/include/android/input.h
index 243c33c..d9486e5 100644
--- a/native/include/android/input.h
+++ b/native/include/android/input.h
@@ -718,8 +718,6 @@ int32_t AInputDevice_getKeyboardType(AInputDevice* device);
int32_t AInputDevice_getMotionRange(AInputDevice* device, int32_t rangeType,
float* outMin, float* outMax, float* outFlat, float* outFuzz);
-//TODO hasKey, keymap stuff, etc...
-
#ifdef __cplusplus
}
#endif