diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-09-20 20:37:44 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-09-20 20:37:44 +0900 |
| commit | 379aeb18366f29b8d9d0f90e2fbb0daa3aaeefa4 (patch) | |
| tree | 1836a0f65c41e66e65b22c2282c2807935dffe7a /java/src/com/android/inputmethod/latin/WordComposer.java | |
| parent | f18fc03621b70f5a51cf54c4bf40eb213de40652 (diff) | |
| parent | 54717534b1164c575a14a4a117284e72c6cd0ee0 (diff) | |
| download | latinime-379aeb18366f29b8d9d0f90e2fbb0daa3aaeefa4.tar.gz latinime-379aeb18366f29b8d9d0f90e2fbb0daa3aaeefa4.tar.xz latinime-379aeb18366f29b8d9d0f90e2fbb0daa3aaeefa4.zip | |
Merge remote-tracking branch 'goog/jb-mr1-dev' into mergescriptpackage
Diffstat (limited to 'java/src/com/android/inputmethod/latin/WordComposer.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WordComposer.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index 4b7adf26b..275ebf305 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -265,9 +265,12 @@ public class WordComposer { * @return true if all user typed chars are upper case, false otherwise */ public boolean isAllUpperCase() { - return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED - || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED - || (mCapsCount > 0) && (mCapsCount == size()); + if (size() <= 1) { + return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED + || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED; + } else { + return mCapsCount == size(); + } } public boolean wasShiftedNoLock() { |