Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a162614 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 287 into donut 

* changes:
  Get Sketch compiling.
parents 98cb6679 8307a0c6

tests/sketch/Android.mk

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_PACKAGE_NAME := Sketch



include $(BUILD_PACKAGE)

tests/sketch/src/com/android/gesture/example/GestureEntryDemo.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -71,7 +71,6 @@ public class GestureEntryDemo extends Activity { 
        mResult = (Spinner) findViewById(R.id.spinner);

        mResult = (Spinner) findViewById(R.id.spinner);

        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {

        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {





            @Override

            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {

            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                // correct the recognition result by adding the new example

                // correct the recognition result by adding the new example
@@ -83,7 +82,6 @@ public class GestureEntryDemo extends Activity { 
                }

                }

            }

            }

  

  

            @Override

            public void onNothingSelected(AdapterView<?> parent) {

            public void onNothingSelected(AdapterView<?> parent) {

              // TODO Auto-generated method stub

              // TODO Auto-generated method stub
@@ -96,17 +94,14 @@ public class GestureEntryDemo extends Activity { 
        mView.cacheGesture(false);

        mView.cacheGesture(false);

        mView.setFadingOut(false);

        mView.setFadingOut(false);

        mView.addGestureListener(new GestureListener() {

        mView.addGestureListener(new GestureListener() {

            @Override

            public void onFinishGesture(GesturePad patch, MotionEvent event) {

            public void onFinishGesture(GesturePad patch, MotionEvent event) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                recognize(patch.getCurrentGesture());

                recognize(patch.getCurrentGesture());

            }

            }

            @Override

            public void onGesture(GesturePad patch, MotionEvent event) {

            public void onGesture(GesturePad patch, MotionEvent event) {

              // TODO Auto-generated method stub

              // TODO Auto-generated method stub

              

              

            }

            }

            @Override

            public void onStartGesture(GesturePad patch, MotionEvent event) {

            public void onStartGesture(GesturePad patch, MotionEvent event) {

              // TODO Auto-generated method stub

              // TODO Auto-generated method stub

tests/sketch/src/com/android/gesture/example/GestureLibViewer.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -87,7 +87,6 @@ public class GestureLibViewer extends Activity { 
        }

        }

        

        

        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {

        mResult.setOnItemSelectedListener(new OnItemSelectedListener() {

            @Override

            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {

            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                mSamples = mRecognizer.getGestures(

                mSamples = mRecognizer.getGestures(
@@ -103,7 +102,6 @@ public class GestureLibViewer extends Activity { 
                mView.invalidate();

                mView.invalidate();

            }

            }

  

  

            @Override

            public void onNothingSelected(AdapterView<?> parent) {

            public void onNothingSelected(AdapterView<?> parent) {

              // TODO Auto-generated method stub

              // TODO Auto-generated method stub
@@ -113,7 +111,6 @@ public class GestureLibViewer extends Activity { 
        

        

        Button remove = (Button)this.findViewById(R.id.remove);

        Button remove = (Button)this.findViewById(R.id.remove);

        remove.setOnClickListener(new OnClickListener() {

        remove.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                if (mSamples.isEmpty())

                if (mSamples.isEmpty())
@@ -154,7 +151,6 @@ public class GestureLibViewer extends Activity { 
        

        

        Button next = (Button)this.findViewById(R.id.next);

        Button next = (Button)this.findViewById(R.id.next);

        next.setOnClickListener(new OnClickListener() {

        next.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                if (mCurrentGestureIndex >= mSamples.size()-1)

                if (mCurrentGestureIndex >= mSamples.size()-1)
@@ -172,7 +168,6 @@ public class GestureLibViewer extends Activity { 




        Button previous = (Button)this.findViewById(R.id.previous);

        Button previous = (Button)this.findViewById(R.id.previous);

        previous.setOnClickListener(new OnClickListener() {

        previous.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View v) {

            public void onClick(View v) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                if (mCurrentGestureIndex >= 1 &&

                if (mCurrentGestureIndex >= 1 &&

tests/sketch/src/com/android/gesture/recognizer/NearestNeighbor.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ public class NearestNeighbor extends Classifier { 
    

    

        

        

        Collections.sort(list, new Comparator<Prediction>() {

        Collections.sort(list, new Comparator<Prediction>() {

            @Override

            public int compare(Prediction object1, Prediction object2) {

            public int compare(Prediction object1, Prediction object2) {

                // TODO Auto-generated method stub

                // TODO Auto-generated method stub

                double score1 = object1.score;

                double score1 = object1.score;