diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-09-05 15:30:26 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 15:30:26 +0000 |
| commit | 5d8363c487e3c7242a2e9c9b48f16c1ad9a6dfa9 (patch) | |
| tree | ea45aea7493098342e5807fcf1087e7fee07cc3f | |
| parent | 66b34d2fb0cc657bbc9caa8c03eece82c592d562 (diff) | |
| parent | 46d111ff4ae5ccf8031ded1742e3f4a68284e5f9 (diff) | |
| download | latinime-5d8363c487e3c7242a2e9c9b48f16c1ad9a6dfa9.tar.gz latinime-5d8363c487e3c7242a2e9c9b48f16c1ad9a6dfa9.tar.xz latinime-5d8363c487e3c7242a2e9c9b48f16c1ad9a6dfa9.zip | |
am 46d111ff: Merge "Fix a bug where CAPS_WORDS would not be returned."
* commit '46d111ff4ae5ccf8031ded1742e3f4a68284e5f9':
Fix a bug where CAPS_WORDS would not be returned.
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java b/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java index 936219332..92bd02c54 100644 --- a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java @@ -217,7 +217,8 @@ public final class CapsModeUtils { // a sentence. If it's neither, the only remaining case is the period so we get the opposite // case out of the way. if (c == Constants.CODE_QUESTION_MARK || c == Constants.CODE_EXCLAMATION_MARK) { - return (TextUtils.CAP_MODE_CHARACTERS | TextUtils.CAP_MODE_SENTENCES) & reqModes; + return (TextUtils.CAP_MODE_CHARACTERS | TextUtils.CAP_MODE_WORDS + | TextUtils.CAP_MODE_SENTENCES) & reqModes; } if (!spacingAndPunctuations.isSentenceSeparator(c) || j <= 0) { return (TextUtils.CAP_MODE_CHARACTERS | TextUtils.CAP_MODE_WORDS) & reqModes; diff --git a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java index c746c8345..5d3664765 100644 --- a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java @@ -124,5 +124,17 @@ public class CapsModeUtilsTests extends AndroidTestCase { allPathsForCaps("Word. ", c | w, sp, false); // Armenian period : capitalize if MODE_SENTENCES allPathsForCaps("Word\u0589 ", c | w | s, sp, false); + + // Test for sentence terminators + sp = job.runInLocale(res, Locale.ENGLISH); + allPathsForCaps("Word? ", c | w | s, sp, false); + allPathsForCaps("Word?", c | w | s, sp, true); + allPathsForCaps("Word?", c, sp, false); + allPathsForCaps("Word! ", c | w | s, sp, false); + allPathsForCaps("Word!", c | w | s, sp, true); + allPathsForCaps("Word!", c, sp, false); + allPathsForCaps("Word; ", c | w, sp, false); + allPathsForCaps("Word;", c | w, sp, true); + allPathsForCaps("Word;", c, sp, false); } } |