diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2013-05-28 17:08:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 17:08:54 -0700 |
commit | 64b5f7cc4ca094754d4631ffb801b7bb771081ec (patch) | |
tree | 2b1b8d46bf0f32e321174b0cd7c507e4634ee0be /native | |
parent | ab4a0541994d5de9520ad4ba37c3a11c5f540eb5 (diff) | |
parent | 09377ddb93a964b9e0def6d84b8beb3a515f4a18 (diff) | |
download | frameworks_base-64b5f7cc4ca094754d4631ffb801b7bb771081ec.zip frameworks_base-64b5f7cc4ca094754d4631ffb801b7bb771081ec.tar.gz frameworks_base-64b5f7cc4ca094754d4631ffb801b7bb771081ec.tar.bz2 |
am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '09377ddb93a964b9e0def6d84b8beb3a515f4a18':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Diffstat (limited to 'native')
-rw-r--r-- | native/android/input.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/native/android/input.cpp b/native/android/input.cpp index 7ac73c7..f6ea576 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -191,73 +191,73 @@ size_t AMotionEvent_getHistorySize(const AInputEvent* motion_event) { return static_cast<const MotionEvent*>(motion_event)->getHistorySize(); } -int64_t AMotionEvent_getHistoricalEventTime(AInputEvent* motion_event, +int64_t AMotionEvent_getHistoricalEventTime(const AInputEvent* motion_event, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalEventTime( history_index); } -float AMotionEvent_getHistoricalRawX(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalRawX( pointer_index, history_index); } -float AMotionEvent_getHistoricalRawY(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalRawY( pointer_index, history_index); } -float AMotionEvent_getHistoricalX(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalX(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalX( pointer_index, history_index); } -float AMotionEvent_getHistoricalY(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalY(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalY( pointer_index, history_index); } -float AMotionEvent_getHistoricalPressure(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalPressure(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalPressure( pointer_index, history_index); } -float AMotionEvent_getHistoricalSize(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalSize(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalSize( pointer_index, history_index); } -float AMotionEvent_getHistoricalTouchMajor(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalTouchMajor(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalTouchMajor( pointer_index, history_index); } -float AMotionEvent_getHistoricalTouchMinor(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalTouchMinor(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalTouchMinor( pointer_index, history_index); } -float AMotionEvent_getHistoricalToolMajor(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalToolMajor(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalToolMajor( pointer_index, history_index); } -float AMotionEvent_getHistoricalToolMinor(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalToolMinor(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalToolMinor( pointer_index, history_index); } -float AMotionEvent_getHistoricalOrientation(AInputEvent* motion_event, size_t pointer_index, +float AMotionEvent_getHistoricalOrientation(const AInputEvent* motion_event, size_t pointer_index, size_t history_index) { return static_cast<const MotionEvent*>(motion_event)->getHistoricalOrientation( pointer_index, history_index); |