diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-05-30 14:23:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 14:23:56 -0700 |
| commit | fa7d40331cecfd89630440cb2fd20a918dc2d0f5 (patch) | |
| tree | 30d73a3d752db911c61343642324237f3e2e6f16 /include | |
| parent | c40f4e64f267c78ff04862456092002d318a8adc (diff) | |
| parent | 75765d3af58ad7ed97c0d646c936294ba861848f (diff) | |
| download | frameworks_native-fa7d40331cecfd89630440cb2fd20a918dc2d0f5.zip frameworks_native-fa7d40331cecfd89630440cb2fd20a918dc2d0f5.tar.gz frameworks_native-fa7d40331cecfd89630440cb2fd20a918dc2d0f5.tar.bz2 | |
am 75765d3a: am 1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '75765d3af58ad7ed97c0d646c936294ba861848f':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/input.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/android/input.h b/include/android/input.h index c8ac938..fead769 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -692,7 +692,7 @@ size_t AMotionEvent_getHistorySize(const AInputEvent* motion_event); /* Get the time that a historical movement occurred between this event and * the previous event, in the java.lang.System.nanoTime() time base. */ -int64_t AMotionEvent_getHistoricalEventTime(AInputEvent* motion_event, +int64_t AMotionEvent_getHistoricalEventTime(const AInputEvent* motion_event, size_t history_index); /* Get the historical raw X coordinate of this event for the given pointer index that @@ -719,14 +719,14 @@ float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t poi * occurred between this event and the previous motion event. * Whole numbers are pixels; the value may have a fraction for input devices * that are sub-pixel precise. */ -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); /* Get the historical Y coordinate of this event for the given pointer index that * occurred between this event and the previous motion event. * Whole numbers are pixels; the value may have a fraction for input devices * that are sub-pixel precise. */ -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); /* Get the historical pressure of this event for the given pointer index that @@ -734,7 +734,7 @@ float AMotionEvent_getHistoricalY(AInputEvent* motion_event, size_t pointer_inde * The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure), * although values higher than 1 may be generated depending on the calibration of * the input device. */ -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); /* Get the current scaled value of the approximate size for the given pointer index that @@ -744,7 +744,7 @@ float AMotionEvent_getHistoricalPressure(AInputEvent* motion_event, size_t point * touch is normalized with the device specific range of values * and scaled to a value between 0 and 1. The value of size can be used to * determine fat touch events. */ -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); /* Get the historical length of the major axis of an ellipse that describes the touch area |