summaryrefslogtreecommitdiff
path: root/src/us
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-05-06 21:45:34 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-05-06 21:45:34 -0400
commit1abc4527631be867cb0da780b6a3de6d28aa1f12 (patch)
tree7a53f94ea29a478119a8d0f056cddfcabeb53cf1 /src/us
parentad4b6b21bb90cb774d95e2040642c5c444c11810 (diff)
parentec03c38576dfc6fd3fa85ed4744efe898bcf51c4 (diff)
Merge branch 'master' of github.com:AndrewMurrell/minak
Conflicts: src/us/minak/IMEView.java
Diffstat (limited to 'src/us')
-rw-r--r--src/us/minak/IMEView.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/us/minak/IMEView.java b/src/us/minak/IMEView.java
index b7b136b..724d69d 100644
--- a/src/us/minak/IMEView.java
+++ b/src/us/minak/IMEView.java
@@ -31,7 +31,7 @@ public class IMEView extends RelativeLayout {
private Button mShiftButton;
private ShiftState mShiftState = ShiftState.OFF;
private final Queue<Character> mSymbolsQueue = new LinkedList<Character>();
-
+
private enum ShiftState {
OFF, ON, CAPS_LOCK
};
@@ -163,7 +163,4 @@ public class IMEView extends RelativeLayout {
throw new IllegalArgumentException();
}
}
-
-
-
}