diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-05-06 21:45:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-05-06 21:45:34 -0400 |
| commit | 1abc4527631be867cb0da780b6a3de6d28aa1f12 (patch) | |
| tree | 7a53f94ea29a478119a8d0f056cddfcabeb53cf1 | |
| parent | ad4b6b21bb90cb774d95e2040642c5c444c11810 (diff) | |
| parent | ec03c38576dfc6fd3fa85ed4744efe898bcf51c4 (diff) | |
Merge branch 'master' of github.com:AndrewMurrell/minak
Conflicts:
src/us/minak/IMEView.java
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/us/minak/IMEView.java | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 256a9b8..a446fb0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -38,7 +38,7 @@ <!-- Temporary labels for buttons --> <string name="button_shift">Shift</string> - <string name="button_backspace">Backspace</string> + <string name="button_backspace">&x2190;</string> <string name="button_space">Space</string> </resources> 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(); } } - - - } |