aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-08 09:06:32 +0000
committerJean Chalard <jchalard@google.com>2014-01-08 18:08:01 +0900
commitb90fa0fb2ce195cfaec878dea9702261290176c2 (patch)
tree6517462166322953496d495d2b75de39a83c0944 /java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
parente5cdcaff658f5366621115a728cb683eab5fda0a (diff)
downloadlatinime-b90fa0fb2ce195cfaec878dea9702261290176c2.tar.gz
latinime-b90fa0fb2ce195cfaec878dea9702261290176c2.tar.xz
latinime-b90fa0fb2ce195cfaec878dea9702261290176c2.zip
Revert "Revert "Separate spacing and punctuation related settings values""
This reverts commit 8bc427799a9b7a53103d1edba4a447033fbd8cfa. Change-Id: I34f509998afdb1a7c120fbfdb9f0a1b188224a4d
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java b/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
index 3d4404a98..6ad5c77d5 100644
--- a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
@@ -191,7 +191,7 @@ public final class CapsModeUtils {
if (c == Constants.CODE_QUESTION_MARK || c == Constants.CODE_EXCLAMATION_MARK) {
return (TextUtils.CAP_MODE_CHARACTERS | TextUtils.CAP_MODE_SENTENCES) & reqModes;
}
- if (settingsValues.mSentenceSeparator != c || j <= 0) {
+ if (!settingsValues.mSpacingAndPunctuations.isSentenceSeparator(c) || j <= 0) {
return (TextUtils.CAP_MODE_CHARACTERS | TextUtils.CAP_MODE_WORDS) & reqModes;
}
@@ -241,7 +241,7 @@ public final class CapsModeUtils {
case WORD:
if (Character.isLetter(c)) {
state = WORD;
- } else if (settingsValues.mSentenceSeparator == c) {
+ } else if (settingsValues.mSpacingAndPunctuations.isSentenceSeparator(c)) {
state = PERIOD;
} else {
return caps;
@@ -257,7 +257,7 @@ public final class CapsModeUtils {
case LETTER:
if (Character.isLetter(c)) {
state = LETTER;
- } else if (settingsValues.mSentenceSeparator == c) {
+ } else if (settingsValues.mSpacingAndPunctuations.isSentenceSeparator(c)) {
state = PERIOD;
} else {
return noCaps;