Merge branch 'master' of github.com:AndrewMurrell/minak

Conflicts:
	src/us/minak/IMEService.java
	src/us/minak/IMEView.java

1 files changed, 17 insertions, 0 deletions

diff --git a/src/us/minak/MetaCircle.java b/src/us/minak/MetaCircle.java
new file mode 100644
index 0000000..8741e20
--- /dev/null
+++ b/src/us/minak/MetaCircle.java
@@ -0,0 +1,17 @@
+package us.minak;
+
+import android.graphics.Color;
+
+/*
+ *	Not sure if this should be drawable or what.
+ *
+ */
+public class MetaCircle {
+	public MetaExpression metaExpr;
+	public int x;
+	public int y;
+	public int radius;
+	public Color color;
+	public boolean expanded;
+	public int expansion; //the level of expansion (if multiple circles are expanded, this decides precidence)
+}