Fix a bug that would persist caps lock state
...with regards to suggestions. It's much simpler to look at
whether the word is actually all capitalized or not.
Bug: 7113544
Change-Id: Idc0e77b2f812964e650ade0e32b9d4c09228cb74
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() {