diff options
author | Romain Guy <romainguy@android.com> | 2009-06-09 12:56:34 -0700 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2009-06-09 22:58:46 -0700 |
commit | 0e1ca5749a96778869ef62f939542a61c034209b (patch) | |
tree | 0eb7fef5f9151e679088aa13db8c428a7ce7198e /core/java/android/gesture | |
parent | faf410443f0c2ab2d30a1c8ce90f83157b5e593b (diff) | |
download | frameworks_base-0e1ca5749a96778869ef62f939542a61c034209b.zip frameworks_base-0e1ca5749a96778869ef62f939542a61c034209b.tar.gz frameworks_base-0e1ca5749a96778869ef62f939542a61c034209b.tar.bz2 |
Add support for gestures in Home.
Adds a new animation style for the gestures pad, and de-normalize
the scores in the recognition engine.
Diffstat (limited to 'core/java/android/gesture')
-rwxr-xr-x | core/java/android/gesture/GestureOverlayView.java | 8 | ||||
-rw-r--r-- | core/java/android/gesture/InstanceLearner.java | 38 |
2 files changed, 28 insertions, 18 deletions
diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java index 98e7dcd..1e81780 100755 --- a/core/java/android/gesture/GestureOverlayView.java +++ b/core/java/android/gesture/GestureOverlayView.java @@ -274,6 +274,14 @@ public class GestureOverlayView extends FrameLayout { return mCurrentGesture; } + public long getFadeOffset() { + return mFadeOffset; + } + + public void setFadeOffset(long fadeOffset) { + mFadeOffset = fadeOffset; + } + public void setGesture(Gesture gesture) { if (mCurrentGesture != null) { clear(false); diff --git a/core/java/android/gesture/InstanceLearner.java b/core/java/android/gesture/InstanceLearner.java index 00cdadc..b93b76f 100644 --- a/core/java/android/gesture/InstanceLearner.java +++ b/core/java/android/gesture/InstanceLearner.java @@ -26,6 +26,20 @@ import java.util.TreeMap; */ class InstanceLearner extends Learner { + private static final Comparator<Prediction> sComparator = new Comparator<Prediction>() { + public int compare(Prediction object1, Prediction object2) { + double score1 = object1.score; + double score2 = object2.score; + if (score1 > score2) { + return -1; + } else if (score1 < score2) { + return 1; + } else { + return 0; + } + } + }; + @Override ArrayList<Prediction> classify(int sequenceType, float[] vector) { ArrayList<Prediction> predictions = new ArrayList<Prediction>(); @@ -55,31 +69,19 @@ class InstanceLearner extends Learner { } } - double sum = 0; +// double sum = 0; for (String name : label2score.keySet()) { double score = label2score.get(name); - sum += score; +// sum += score; predictions.add(new Prediction(name, score)); } // normalize - for (Prediction prediction : predictions) { - prediction.score /= sum; - } +// for (Prediction prediction : predictions) { +// prediction.score /= sum; +// } - Collections.sort(predictions, new Comparator<Prediction>() { - public int compare(Prediction object1, Prediction object2) { - double score1 = object1.score; - double score2 = object2.score; - if (score1 > score2) { - return -1; - } else if (score1 < score2) { - return 1; - } else { - return 0; - } - } - }); + Collections.sort(predictions, sComparator); return predictions; } |