Rename GestureUtilities to GestureUtils.

diff --git a/api/current.xml b/api/current.xml
index 0c46100..466943f 100644 (file)
--- a/api/current.xml
+++ b/api/current.xml
@@ -55606,7 +55606,7 @@
 >
 </field>
 </class>
-<class name="GestureUtilities"
+<class name="GestureUtils"
  extends="java.lang.Object"
  abstract="false"
  static="false"

diff --git a/core/java/android/gesture/Gesture.java b/core/java/android/gesture/Gesture.java
index d71344c..300cd28 100755 (executable)
--- a/core/java/android/gesture/Gesture.java
+++ b/core/java/android/gesture/Gesture.java
@@ -293,7 +293,7 @@ public class Gesture implements Parcelable {
             } catch (IOException e) {
                 Log.e(GestureConstants.LOG_TAG, "Error reading Gesture from parcel:", e);
             } finally {
-                GestureUtilities.closeStream(inStream);
+                GestureUtils.closeStream(inStream);
             }
 
             if (gesture != null) {
@@ -322,8 +322,8 @@ public class Gesture implements Parcelable {
         } catch (IOException e) {
             Log.e(GestureConstants.LOG_TAG, "Error writing Gesture to parcel:", e);
         } finally {
-            GestureUtilities.closeStream(outStream);
-            GestureUtilities.closeStream(byteStream);
+            GestureUtils.closeStream(outStream);
+            GestureUtils.closeStream(byteStream);
         }
 
         if (result) {

diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java
index 30ecf5a..b6c260f 100755 (executable)
--- a/core/java/android/gesture/GestureOverlayView.java
+++ b/core/java/android/gesture/GestureOverlayView.java
@@ -638,7 +638,7 @@ public class GestureOverlayView extends FrameLayout {
 
                 if (mTotalLength > mGestureStrokeLengthThreshold) {
                     final OrientedBoundingBox box =
-                            GestureUtilities.computeOrientedBoundingBox(mStrokeBuffer);
+                            GestureUtils.computeOrientedBoundingBox(mStrokeBuffer);
 
                     float angle = Math.abs(box.orientation);
                     if (angle > 90) {

diff --git a/core/java/android/gesture/GestureStore.java b/core/java/android/gesture/GestureStore.java
index 11a94d1..11b5044 100644 (file)
--- a/core/java/android/gesture/GestureStore.java
+++ b/core/java/android/gesture/GestureStore.java
@@ -264,7 +264,7 @@ public class GestureStore {
 
             mChanged = false;
         } finally {
-            if (closeStream) GestureUtilities.closeStream(out);
+            if (closeStream) GestureUtils.closeStream(out);
         }
     }
 
@@ -299,7 +299,7 @@ public class GestureStore {
                 Log.d(LOG_TAG, "Loading gestures library = " + (end - start) + " ms");
             }
         } finally {
-            if (closeStream) GestureUtilities.closeStream(in);
+            if (closeStream) GestureUtils.closeStream(in);
         }
     }
 

diff --git a/core/java/android/gesture/GestureStroke.java b/core/java/android/gesture/GestureStroke.java
index c3ddb28..1d0f0fe 100644 (file)
--- a/core/java/android/gesture/GestureStroke.java
+++ b/core/java/android/gesture/GestureStroke.java
@@ -159,15 +159,15 @@ public class GestureStroke {
      * @return the path
      */
     public Path toPath(float width, float height, int numSample) {
-        final float[] pts = GestureUtilities.temporalSampling(this, numSample);
+        final float[] pts = GestureUtils.temporalSampling(this, numSample);
         final RectF rect = boundingBox;
 
-        GestureUtilities.translate(pts, -rect.left, -rect.top);
+        GestureUtils.translate(pts, -rect.left, -rect.top);
         
         float sx = width / rect.width();
         float sy = height / rect.height();
         float scale = sx > sy ? sy : sx;
-        GestureUtilities.scale(pts, scale, scale);
+        GestureUtils.scale(pts, scale, scale);
 
         float mX = 0;
         float mY = 0;
@@ -241,6 +241,6 @@ public class GestureStroke {
      * @return OrientedBoundingBox
      */
     public OrientedBoundingBox computeOrientedBoundingBox() {
-        return GestureUtilities.computeOrientedBoundingBox(points);
+        return GestureUtils.computeOrientedBoundingBox(points);
     }
 }

diff --git a/core/java/android/gesture/GestureUtilities.java b/core/java/android/gesture/GestureUtils.java
similarity index 99%
rename from core/java/android/gesture/GestureUtilities.java
rename to core/java/android/gesture/GestureUtils.java
index 9d95ce4..dd221fc 100755 (executable)
--- a/core/java/android/gesture/GestureUtilities.java
+++ b/core/java/android/gesture/GestureUtils.java
@@ -36,12 +36,12 @@ import static android.gesture.GestureConstants.*;
  * distances between two gestures).
  * </ul>
  */
-public final class GestureUtilities {
+public final class GestureUtils {
   
     private static final float SCALING_THRESHOLD = 0.26f;
     private static final float NONUNIFORM_SCALE = (float) Math.sqrt(2);
     
-    private GestureUtilities() {
+    private GestureUtils() {
     }
 
     /**

diff --git a/core/java/android/gesture/Instance.java b/core/java/android/gesture/Instance.java
index bb0b340..02a6519 100755 (executable)
--- a/core/java/android/gesture/Instance.java
+++ b/core/java/android/gesture/Instance.java
@@ -84,13 +84,13 @@ class Instance {
     }
 
     private static float[] spatialSampler(Gesture gesture) {
-        return GestureUtilities.spatialSampling(gesture, PATCH_SAMPLE_SIZE, false);
+        return GestureUtils.spatialSampling(gesture, PATCH_SAMPLE_SIZE, false);
     }
 
     private static float[] temporalSampler(int orientationType, Gesture gesture) {
-        float[] pts = GestureUtilities.temporalSampling(gesture.getStrokes().get(0),
+        float[] pts = GestureUtils.temporalSampling(gesture.getStrokes().get(0),
                 SEQUENCE_SAMPLE_SIZE);
-        float[] center = GestureUtilities.computeCentroid(pts);
+        float[] center = GestureUtils.computeCentroid(pts);
         float orientation = (float)Math.atan2(pts[1] - center[1], pts[0] - center[0]);
 
         float adjustment = -orientation;
@@ -104,8 +104,8 @@ class Instance {
             }
         }
 
-        GestureUtilities.translate(pts, -center[0], -center[1]);
-        GestureUtilities.rotate(pts, adjustment);
+        GestureUtils.translate(pts, -center[0], -center[1]);
+        GestureUtils.rotate(pts, adjustment);
 
         return pts;
     }

diff --git a/core/java/android/gesture/InstanceLearner.java b/core/java/android/gesture/InstanceLearner.java
index 9987e69..7224ded 100644 (file)
--- a/core/java/android/gesture/InstanceLearner.java
+++ b/core/java/android/gesture/InstanceLearner.java
@@ -53,9 +53,9 @@ class InstanceLearner extends Learner {
             }
             double distance;
             if (sequenceType == GestureStore.SEQUENCE_SENSITIVE) {
-                distance = GestureUtilities.minimumCosineDistance(sample.vector, vector, orientationType);
+                distance = GestureUtils.minimumCosineDistance(sample.vector, vector, orientationType);
             } else {
-                distance = GestureUtilities.squaredEuclideanDistance(sample.vector, vector);
+                distance = GestureUtils.squaredEuclideanDistance(sample.vector, vector);
             }
             double weight;
             if (distance == 0) {