Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e88192b9: Cleanup fixes for ScaleGestureDetector

Browse Source 
Merge commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp

* commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6':
  Cleanup fixes for ScaleGestureDetector
This commit is contained in:
Adam Powell
2010-02-09 10:55:57 -08:00
committed by Android Git Automerger
parent 37a00a36fb e88192b9d2
commit 18f75bd45c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/ScaleGestureDetector.java
View File

@@ -18,7 +18,6 @@ package android.view;
import android.content.Context; import android.content.Context;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
/** /**
* Detects transformation gestures involving more than one pointer ("multitouch") * Detects transformation gestures involving more than one pointer ("multitouch")
@@ -45,9 +44,9 @@ public class ScaleGestureDetector {
* *
* An application will receive events in the following order: * An application will receive events in the following order:
* <ul> * <ul>
* <li>One {@link OnScaleGestureListener#onScaleBegin()} * <li>One {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)}
* <li>Zero or more {@link OnScaleGestureListener#onScale()} * <li>Zero or more {@link OnScaleGestureListener#onScale(ScaleGestureDetector)}
* <li>One {@link OnScaleGestureListener#onTransformEnd()} * <li>One {@link OnScaleGestureListener#onScaleEnd(ScaleGestureDetector)}
* </ul> * </ul>
*/ */
public interface OnScaleGestureListener { public interface OnScaleGestureListener {
@@ -82,8 +81,7 @@ public class ScaleGestureDetector {
/** /**
* Responds to the end of a scale gesture. Reported by existing * Responds to the end of a scale gesture. Reported by existing
* pointers going up. If the end of a gesture would result in a fling, * pointers going up.
* {@link onTransformFling()} is called instead.
* *
* Once a scale has ended, {@link ScaleGestureDetector#getFocusX()} * Once a scale has ended, {@link ScaleGestureDetector#getFocusX()}
* and {@link ScaleGestureDetector#getFocusY()} will return the location * and {@link ScaleGestureDetector#getFocusY()} will return the location
@@ -103,7 +101,7 @@ public class ScaleGestureDetector {
* {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)} return * {@link OnScaleGestureListener#onScaleBegin(ScaleGestureDetector)} return
* {@code true}. * {@code true}.
*/ */
public class SimpleOnScaleGestureListener implements OnScaleGestureListener { public static class SimpleOnScaleGestureListener implements OnScaleGestureListener {
public boolean onScale(ScaleGestureDetector detector) { public boolean onScale(ScaleGestureDetector detector) {
return true; return true;
@@ -373,7 +371,7 @@ public class ScaleGestureDetector {
* the two pointers forming the gesture. * the two pointers forming the gesture.
* If a gesture is ending, the focal point is the location of the * If a gesture is ending, the focal point is the location of the
* remaining pointer on the screen. * 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. * function is undefined.
* *
* @return X coordinate of the focal point in pixels. * @return X coordinate of the focal point in pixels.
@@ -388,7 +386,7 @@ public class ScaleGestureDetector {
* the two pointers forming the gesture. * the two pointers forming the gesture.
* If a gesture is ending, the focal point is the location of the * If a gesture is ending, the focal point is the location of the
* remaining pointer on the screen. * 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. * function is undefined.
* *
* @return Y coordinate of the focal point in pixels. * @return Y coordinate of the focal point in pixels.
@@ -430,7 +428,7 @@ public class ScaleGestureDetector {
/** /**
* Return the scaling factor from the previous scale event to the current * Return the scaling factor from the previous scale event to the current
* event. This value is defined as * event. This value is defined as
* ({@link getCurrentSpan()} / {@link getPreviousSpan()}). * ({@link #getCurrentSpan()} / {@link #getPreviousSpan()}).
* *
* @return The current scaling factor. * @return The current scaling factor.
*/ */