am a0ebb28d: Merge "Fix a bug with capitalizations (A15)" into jb-mr1-dev

* commit 'a0ebb28d151fbdff529a17d4d021b1c1988639b2':
  Fix a bug with capitalizations (A15)
This commit is contained in:
Jean Chalard 2012-09-18 20:06:08 -07:00 committed by Android Git Automerger
commit 493cca577f

View file

@ -267,7 +267,7 @@ public class WordComposer {
public boolean isAllUpperCase() { public boolean isAllUpperCase() {
return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED
|| mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED
|| (mCapsCount > 0) && (mCapsCount == size()); || (mCapsCount > 1) && (mCapsCount == size());
} }
public boolean wasShiftedNoLock() { public boolean wasShiftedNoLock() {