diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-08-21 05:18:20 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-21 05:18:20 -0700 |
| commit | 9e928aa581a226d32c6b1cc64bfbe75652c54dd1 (patch) | |
| tree | 1986f61652adfd57681e6f2e38a2f4093014badc /java/src/com | |
| parent | 2392bad916402c90d2218a9fddb6bcb19060d4b5 (diff) | |
| parent | 3518818eaff64e0fd1c2e8483202deabd4dc9975 (diff) | |
| download | latinime-9e928aa581a226d32c6b1cc64bfbe75652c54dd1.tar.gz latinime-9e928aa581a226d32c6b1cc64bfbe75652c54dd1.tar.xz latinime-9e928aa581a226d32c6b1cc64bfbe75652c54dd1.zip | |
am 3518818e: am 8b6b5592: Merge "Treat all caps for gesture input." into jb-mr1-dev
* commit '3518818eaff64e0fd1c2e8483202deabd4dc9975':
Treat all caps for gesture input.
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Suggest.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WordComposer.java | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 6a4562c49..c75322691 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -309,10 +309,8 @@ public class Suggest { final ArrayList<SuggestedWordInfo> suggestionsContainer = new ArrayList<SuggestedWordInfo>(suggestionsSet); final int suggestionsCount = suggestionsContainer.size(); - final boolean isFirstCharCapitalized = wordComposer.wasAutoCapitalized(); - // TODO: Handle the manual temporary shifted mode. - // TODO: Should handle TextUtils.CAP_MODE_CHARACTER. - final boolean isAllUpperCase = false; + final boolean isFirstCharCapitalized = wordComposer.wasShiftedNoLock(); + final boolean isAllUpperCase = wordComposer.isAllUpperCase(); if (isFirstCharCapitalized || isAllUpperCase) { for (int i = 0; i < suggestionsCount; ++i) { final SuggestedWordInfo wordInfo = suggestionsContainer.get(i); diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index 64e833bde..ecec60f89 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -265,7 +265,14 @@ public class WordComposer { * @return true if all user typed chars are upper case, false otherwise */ public boolean isAllUpperCase() { - return (mCapsCount > 0) && (mCapsCount == size()); + return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED + || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED + || (mCapsCount > 0) && (mCapsCount == size()); + } + + public boolean wasShiftedNoLock() { + return mCapitalizedMode == CAPS_MODE_AUTO_SHIFTED + || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFTED; } /** |