aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/TextEntryState.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-10-25 21:35:43 +0900
committerJean Chalard <jchalard@google.com>2011-10-25 21:35:43 +0900
commitce668e7a0b6ae7046e1f22a162ad174d58dfe145 (patch)
treeffcf38d331c16238fe63f280bc7d2d985d8c5964 /java/src/com/android/inputmethod/latin/TextEntryState.java
parent126698fdd256a2e3734634d3b923cabd800064ba (diff)
downloadlatinime-ce668e7a0b6ae7046e1f22a162ad174d58dfe145.tar.gz
latinime-ce668e7a0b6ae7046e1f22a162ad174d58dfe145.tar.xz
latinime-ce668e7a0b6ae7046e1f22a162ad174d58dfe145.zip
Small clean up.
Remove unused methods and constants. Change-Id: If72e04394a2943b416915217d22cb6e58a0508b3
Diffstat (limited to 'java/src/com/android/inputmethod/latin/TextEntryState.java')
-rw-r--r--java/src/com/android/inputmethod/latin/TextEntryState.java33
1 files changed, 5 insertions, 28 deletions
diff --git a/java/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
index ba93ab526..4204b8a4f 100644
--- a/java/src/com/android/inputmethod/latin/TextEntryState.java
+++ b/java/src/com/android/inputmethod/latin/TextEntryState.java
@@ -34,8 +34,7 @@ public class TextEntryState {
private static final int SPACE_AFTER_ACCEPTED = 6;
private static final int SPACE_AFTER_PICKED = 7;
private static final int UNDO_COMMIT = 8;
- private static final int RECORRECTING = 9;
- private static final int PICKED_RECORRECTION = 10;
+ private static final int PICKED_RECORRECTION = 9;
private static int sState = UNKNOWN;
private static int sPreviousState = UNKNOWN;
@@ -78,7 +77,9 @@ public class TextEntryState {
}
public static void acceptedSuggestion(CharSequence typedWord, CharSequence actualWord) {
- if (sState == RECORRECTING || sState == PICKED_RECORRECTION) {
+ if (sState == PICKED_RECORRECTION) {
+ // TODO: this seems to be the only place where setState(PICKED_RECORRECTION) is done
+ // so this state should never be reached. Check this and remove.
setState(PICKED_RECORRECTION);
} else {
setState(PICKED_SUGGESTION);
@@ -87,18 +88,6 @@ public class TextEntryState {
displayState("acceptedSuggestion", "typedWord", typedWord, "actualWord", actualWord);
}
- public static void selectedForRecorrection() {
- setState(RECORRECTING);
- if (DEBUG) displayState("selectedForRecorrection");
- }
-
- public static void onAbortRecorrection() {
- if (sState == RECORRECTING || sState == PICKED_RECORRECTION) {
- setState(START);
- }
- if (DEBUG) displayState("onAbortRecorrection");
- }
-
public static void typedCharacter(char c, boolean isSeparator, int x, int y) {
final boolean isSpace = (c == Keyboard.CODE_SPACE);
switch (sState) {
@@ -148,9 +137,6 @@ public class TextEntryState {
setState(IN_WORD);
}
break;
- case RECORRECTING:
- setState(START);
- break;
}
RingCharBuffer.getInstance().push(c, x, y);
if (isSeparator) {
@@ -176,20 +162,12 @@ public class TextEntryState {
if (DEBUG) displayState("reset");
}
- public static boolean isAcceptedDefault() {
- return sState == ACCEPTED_DEFAULT;
- }
-
public static boolean isUndoCommit() {
return sState == UNDO_COMMIT;
}
- public static boolean isPunctuationAfterAccepted() {
- return sState == PUNCTUATION_AFTER_ACCEPTED;
- }
-
public static boolean isRecorrecting() {
- return sState == RECORRECTING || sState == PICKED_RECORRECTION;
+ return sState == PICKED_RECORRECTION;
}
public static String getState() {
@@ -206,7 +184,6 @@ public class TextEntryState {
case SPACE_AFTER_ACCEPTED: return "SPACE_AFTER_ACCEPTED";
case SPACE_AFTER_PICKED: return "SPACE_AFTER_PICKED";
case UNDO_COMMIT: return "UNDO_COMMIT";
- case RECORRECTING: return "RECORRECTING";
case PICKED_RECORRECTION: return "PICKED_RECORRECTION";
default: return "UNKNOWN";
}