diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/MotionEvent.java | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 1bdb0e647bad..b7c1bbd2b80f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25566,6 +25566,7 @@ package android.view { } public final class MotionEvent extends android.view.InputEvent implements android.os.Parcelable { + method public static java.lang.String actionToString(int); method public final void addBatch(long, float, float, float, float, int); method public final void addBatch(long, android.view.MotionEvent.PointerCoords[], int); method public static int axisFromString(java.lang.String); diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index ee3609769615..db577f3627cf 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -3003,13 +3003,13 @@ public final class MotionEvent extends InputEvent implements Parcelable { } /** - * Returns a string that represents the symbolic name of the specified action + * Returns a string that represents the symbolic name of the specified unmasked action * such as "ACTION_DOWN", "ACTION_POINTER_DOWN(3)" or an equivalent numeric constant * such as "35" if unknown. * - * @param action The action. + * @param action The unmasked action. * @return The symbolic name of the specified action. - * @hide + * @see #getAction() */ public static String actionToString(int action) { switch (action) { @@ -3047,7 +3047,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { * Returns a string that represents the symbolic name of the specified axis * such as "AXIS_X" or an equivalent numeric constant such as "42" if unknown. * - * @param axis The axis + * @param axis The axis. * @return The symbolic name of the specified axis. */ public static String axisToString(int axis) { @@ -3061,7 +3061,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { * * @param symbolicName The symbolic name of the axis. * @return The axis or -1 if not found. - * @see KeyEvent#keycodeToString(int) + * @see KeyEvent#keyCodeToString(int) */ public static int axisFromString(String symbolicName) { if (symbolicName == null) { |