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
main
Jean Chalard 2012-09-19 12:52:06 +09:00
parent a0ebb28d15
commit ad0642cf25
1 changed files with 6 additions and 3 deletions

View File

@ -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() {