LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."

Browse Source 
* commit '9dacf7ee76a54333c0774eb8c870a3d8b2ef6c5d':
  Fix two incorrect <android/input.h> function declarations.
This commit is contained in:
David 'Digit' Turner
2011-03-21 07:10:57 -07:00
committed by Android Git Automerger
parent 091b78c203 9dacf7ee76
commit 282bd952be
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ndk/platforms/android-9/include/android/input.h
View File

@@ -485,7 +485,7 @@ float AMotionEvent_getY(const AInputEvent* motion_event, size_t pointer_index);
/* Get the current pressure of this event for the given pointer index. /* Get the current pressure of this event for the given pointer index.
* The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure), * The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure),
* however values higher than 1 may be generated depending on the calibration of * although values higher than 1 may be generated depending on the calibration of
* the input device. */ * the input device. */
float AMotionEvent_getPressure(const AInputEvent* motion_event, size_t pointer_index); float AMotionEvent_getPressure(const AInputEvent* motion_event, size_t pointer_index);
@@ -545,7 +545,8 @@ int64_t AMotionEvent_getHistoricalEventTime(AInputEvent* motion_event,
* and views. * and views.
* Whole numbers are pixels; the value may have a fraction for input devices * Whole numbers are pixels; the value may have a fraction for input devices
* that are sub-pixel precise. */ * that are sub-pixel precise. */
float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t pointer_index); float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t pointer_index,
size_t history_index);
/* Get the historical raw Y coordinate of this event for the given pointer index that /* Get the historical raw Y coordinate of this event for the given pointer index that
* occurred between this event and the previous motion event. * occurred between this event and the previous motion event.
@@ -554,7 +555,8 @@ float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t poi
* and views. * and views.
* Whole numbers are pixels; the value may have a fraction for input devices * Whole numbers are pixels; the value may have a fraction for input devices
* that are sub-pixel precise. */ * that are sub-pixel precise. */
float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t pointer_index); float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t pointer_index,
size_t history_index);
/* Get the historical X coordinate of this event for the given pointer index that /* Get the historical X coordinate of this event for the given pointer index that
* occurred between this event and the previous motion event. * occurred between this event and the previous motion event.
@@ -573,7 +575,7 @@ float AMotionEvent_getHistoricalY(AInputEvent* motion_event, size_t pointer_inde
/* Get the historical pressure of this event for the given pointer index that /* Get the historical pressure of this event for the given pointer index that
* occurred between this event and the previous motion event. * occurred between this event and the previous motion event.
* The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure), * The pressure generally ranges from 0 (no pressure at all) to 1 (normal pressure),
* however values higher than 1 may be generated depending on the calibration of * although values higher than 1 may be generated depending on the calibration of
* the input device. */ * the input device. */
float AMotionEvent_getHistoricalPressure(AInputEvent* motion_event, size_t pointer_index, float AMotionEvent_getHistoricalPressure(AInputEvent* motion_event, size_t pointer_index,
size_t history_index); size_t history_index);