Merge "Javadoc fixes to ScaleGestureDetector for SDK builds" (378a1488) · Commits · e / os / android_frameworks_base

core/java/android/view/ScaleGestureDetector.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -43,9 +43,9 @@ public class ScaleGestureDetector {
		*
		* An application will receive events in the following order:
		* <ul>
		* <li>One {@link OnScaleGestureListener#onScaleBegin()}
		* <li>Zero or more {@link OnScaleGestureListener#onScale()}
		* <li>One {@link OnScaleGestureListener#onTransformEnd()}
		* <li>One {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)}
		* <li>Zero or more {@link OnScaleGestureListener#onScale(ScaleGestureDetector)}
		* <li>One {@link OnScaleGestureListener#onScaleEnd(ScaleGestureDetector)}
		* </ul>
		*/
		public interface OnScaleGestureListener {
		@@ -370,7 +370,7 @@ public class ScaleGestureDetector {
		* the two pointers forming the gesture.
		* If a gesture is ending, the focal point is the location of the
		* remaining pointer on the screen.
		* If {@link isInProgress()} would return false, the result of this
		* If {@link #isInProgress()} would return false, the result of this
		* function is undefined.
		*
		* @return X coordinate of the focal point in pixels.
		@@ -385,7 +385,7 @@ public class ScaleGestureDetector {
		* the two pointers forming the gesture.
		* If a gesture is ending, the focal point is the location of the
		* remaining pointer on the screen.
		* If {@link isInProgress()} would return false, the result of this
		* If {@link #isInProgress()} would return false, the result of this
		* function is undefined.
		*
		* @return Y coordinate of the focal point in pixels.
		@@ -427,7 +427,7 @@ public class ScaleGestureDetector {
		/**
		* Return the scaling factor from the previous scale event to the current
		* event. This value is defined as
		* ({@link getCurrentSpan()} / {@link getPreviousSpan()}).
		* ({@link #getCurrentSpan()} / {@link #getPreviousSpan()}).
		*
		* @return The current scaling factor.
		*/