summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-08-10 16:39:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 16:39:10 -0700
commitea48ff4ba405923a88f5f0ef22be607be6310564 (patch)
treec9a55ac4a123231f6c9fa2af407c0b14644a5a57 /include
parentfb8e05b154c9dd1b36696c20985a3ce70d851b94 (diff)
parent95105f3c25110f28b236cfa71e9ad74533eef854 (diff)
downloadframeworks_base-ea48ff4ba405923a88f5f0ef22be607be6310564.zip
frameworks_base-ea48ff4ba405923a88f5f0ef22be607be6310564.tar.gz
frameworks_base-ea48ff4ba405923a88f5f0ef22be607be6310564.tar.bz2
am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode().
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854' * commit '95105f3c25110f28b236cfa71e9ad74533eef854': Fix safe mode and KeyEvent.getMaxKeyCode().
Diffstat (limited to 'include')
-rw-r--r--include/ui/InputReader.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h
index f162231..71c6c51 100644
--- a/include/ui/InputReader.h
+++ b/include/ui/InputReader.h
@@ -454,6 +454,8 @@ public:
virtual void reset();
virtual void process(const RawEvent* rawEvent);
+ virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode);
+
private:
// Amount that trackball needs to move in order to generate a key event.
static const int32_t TRACKBALL_MOVEMENT_THRESHOLD = 6;