From 70d9152c7f9e06d7d02dbbcb53af5c8f19d16b8d Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 28 Mar 2014 14:35:38 +0900
Subject: [PATCH] Some cleanup

Change-Id: Ia11d656a70623168b091763ac6524750f9cca8d8
---
 java/src/com/android/inputmethod/latin/WordComposer.java   | 7 ++++++-
 .../android/inputmethod/latin/inputlogic/InputLogic.java   | 6 ++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index 324683c86..8a321e257 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
@@ -132,10 +132,15 @@ public final class WordComposer {
      * Number of keystrokes in the composing word.
      * @return the number of keystrokes
      */
-    public final int size() {
+    // This may be made public if need be, but right now it's not used anywhere
+    /* package for tests */ int size() {
         return mCodePointSize;
     }
 
+    public boolean isSingleLetter() {
+        return size() == 1;
+    }
+
     // When the composition contains trailing quotes, we don't pass them to the suggestion engine.
     // This is because "'tgis'" should be corrected to "'this'", but we can't afford to consider
     // single quotes as separators because of their very common use as apostrophes.
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 3a59be198..79b8a3711 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -513,14 +513,12 @@ public final class InputLogic {
                             mWordComposer);
                 }
             }
-            final int wordComposerSize = mWordComposer.size();
-            // Since isComposingWord() is true, the size is at least 1.
             if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
                 // If we are in the middle of a recorrection, we need to commit the recorrection
                 // first so that we can insert the batch input at the current cursor position.
                 resetEntireInputState(mConnection.getExpectedSelectionStart(),
                         mConnection.getExpectedSelectionEnd(), true /* clearSuggestionStrip */);
-            } else if (wordComposerSize <= 1) {
+            } else if (mWordComposer.isSingleLetter()) {
                 // We auto-correct the previous (typed, not gestured) string iff it's one character
                 // long. The reason for this is, even in the middle of gesture typing, you'll still
                 // tap one-letter words and you want them auto-corrected (typically, "i" in English
@@ -740,7 +738,7 @@ public final class InputLogic {
         if (isComposingWord) {
             mWordComposer.add(inputTransaction.mEvent);
             // If it's the first letter, make note of auto-caps state
-            if (mWordComposer.size() == 1) {
+            if (mWordComposer.isSingleLetter()) {
                 // We pass 1 to getPreviousWordForSuggestion because we were not composing a word
                 // yet, so the word we want is the 1st word before the cursor.
                 mWordComposer.setCapitalizedModeAndPreviousWordAtStartComposingTime(