From ad4b6b21bb90cb774d95e2040642c5c444c11810 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 6 May 2014 21:44:44 -0400 Subject: Andrew wants this --- src/us/minak/IMEView.java | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'src/us/minak/IMEView.java') diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java index 8bf1967..b7b136b 100644 --- a/src/us/minak/IMEView.java +++ b/src/us/minak/IMEView.java @@ -13,14 +13,11 @@ package us.minak; import java.util.LinkedList; -import java.util.List; import java.util.Locale; import java.util.Queue; import android.content.Context; -import android.graphics.Color; import android.util.AttributeSet; -import android.view.MotionEvent; import android.view.View; import android.widget.Button; import android.widget.RelativeLayout; @@ -34,27 +31,7 @@ public class IMEView extends RelativeLayout { private Button mShiftButton; private ShiftState mShiftState = ShiftState.OFF; private final Queue mSymbolsQueue = new LinkedList(); - private float x; - private float y; - private boolean ongoingGesture = false; - - public boolean setTouchLocation(float x, float y) { - if (!ongoingGesture) { - this.x = x; - this.y = y; - return true; - } - return false; - } - - public void setState(boolean state) { - ongoingGesture = state; - } - - public boolean getState() { - return ongoingGesture; - } - + private enum ShiftState { OFF, ON, CAPS_LOCK }; @@ -84,11 +61,6 @@ public class IMEView extends RelativeLayout { final Button spaceButton = (Button) findViewById(R.id.space_btn); spaceButton.setOnClickListener(mButtonClickListener); spaceButton.setOnLongClickListener(mButtonLongClickListener); - - //dynamic MetaCircle adding stuff here. replace null with Shift or Ctrl or Meta or Alt or Hyper or whatever. - drawingSpaceView.circles.add(new MetaCircle((float)50.0, (float)50.0, (float)20.0, Color.RED, new MetaExpression(null))); - drawingSpaceView.circles.add(new MetaCircle((float)70.0, (float)70.0, (float)20.0, Color.RED, new MetaExpression(null))); - drawingSpaceView.circles.add(new MetaCircle((float)50.0, (float)30.0, (float)20.0, Color.RED, new MetaExpression(null))); } public void setOnCharacterEnteredListener(StringReciever onCharacterEnteredListener) { @@ -147,13 +119,6 @@ public class IMEView extends RelativeLayout { } }; - private final OnTouchListener mOnTouchListener = new OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return setTouchLocation(event.getX(), event.getY()); - } - }; - /** * Changes shift state to the next one (OFF -> ON -> CAPS LOCK). */ @@ -183,7 +148,6 @@ public class IMEView extends RelativeLayout { * The character to enter */ private void enterCharacter(String character) { - //for each circle in circles check to see if the touch was in the circle and apply the meta-key switch (mShiftState) { case OFF: mOnCharacterEnteredListener.putString(character); -- cgit v1.2.3