diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-08-21 19:57:21 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-08-21 20:29:53 +0900 |
| commit | 1eba97d92fb5caa4f23425837b6680ccc2a23ae8 (patch) | |
| tree | c67c2a3dc6cd258bc7c230fac471f648fd1d9edc /java/src | |
| parent | adbd9ae105e06287b59379d7f7127d95fd0663f4 (diff) | |
| download | latinime-1eba97d92fb5caa4f23425837b6680ccc2a23ae8.tar.gz latinime-1eba97d92fb5caa4f23425837b6680ccc2a23ae8.tar.xz latinime-1eba97d92fb5caa4f23425837b6680ccc2a23ae8.zip | |
Treat all caps for gesture input.
Bug: 6950087
Change-Id: I9f2271780600572c9befa96c7ad98494c554dd2b
Diffstat (limited to 'java/src')
| -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 0580d8954..9ca9b7e71 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -270,7 +270,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; } /** |