Merge "Unhide MotionEvent#actionToString." (894e1d99) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

+5 −5

Original line number	Diff line number	Diff line
		@@ -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) {