commit 94567d8bea35555b5708e517c857dfe7c3d0eff8
author Jean Chalard <jchalard@google.com> Wed Sep 19 05:50:13 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 19 05:50:13 2012 -0700
tree 953b35355021532cb01015d7abfc12f485f05ab0
parent 9d014cde85b820dc095d6ac0bcbe3647fae6d5e1
parent caf15c3c678dc9e95b1bcdc33ee0cb10182f171c

am caf15c3c: Merge "Fix a bug that would persist caps lock state" into jb-mr1-dev

* commit 'caf15c3c678dc9e95b1bcdc33ee0cb10182f171c':
  Fix a bug that would persist caps lock state

java/src/com/android/inputmethod/latin/WordComposer.java

diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index 7785e3f..275ebf3 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
@@ -265,9 +265,12 @@
      * @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() {