diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-09-19 02:30:49 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-09-19 02:30:49 -0700 |
| commit | caf15c3c678dc9e95b1bcdc33ee0cb10182f171c (patch) | |
| tree | 953b35355021532cb01015d7abfc12f485f05ab0 /java/src/com/android/inputmethod | |
| parent | 8eb206528971404272a4bac81fc69ee91cf12c9d (diff) | |
| parent | ad0642cf258ca9b123f74ca0ae8bf970792908f1 (diff) | |
| download | latinime-caf15c3c678dc9e95b1bcdc33ee0cb10182f171c.tar.gz latinime-caf15c3c678dc9e95b1bcdc33ee0cb10182f171c.tar.xz latinime-caf15c3c678dc9e95b1bcdc33ee0cb10182f171c.zip | |
Merge "Fix a bug that would persist caps lock state" into jb-mr1-dev
Diffstat (limited to 'java/src/com/android/inputmethod')
| -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 7785e3fb9..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 > 1) && (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() { |