summaryrefslogtreecommitdiff
path: root/core/java/android/view/MotionEvent.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-06-05 13:17:05 -0400
committerJohn Spurlock <jspurlock@google.com>2013-06-05 13:25:28 -0400
commit4dad6cab641f95524d86d0fe9f9d46e323aeb41b (patch)
treefc23cf37ebcc99d42cb7f06f22ebbe504630aa7f /core/java/android/view/MotionEvent.java
parent5b27decb1d59b3d35194f28e49d98485c0e57427 (diff)
Unhide MotionEvent#actionToString.
Also clarify the input as unmasked, and fix a few other found doc issues in related methods. Change-Id: I1338a17dea0282b99229925dea8e48693e177eaa
Diffstat (limited to 'core/java/android/view/MotionEvent.java')
-rw-r--r--core/java/android/view/MotionEvent.java10
1 files changed, 5 insertions, 5 deletions
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) {