From 5fbe3764ae074a7bb79dfa78d3ed67d437a49700 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 13 Sep 2012 16:19:21 +0900
Subject: [PATCH] Small simplification (A3)
Change-Id: I2ea9566ce5cb1fbccd33a42836244a899365de6a
---
java/src/com/android/inputmethod/latin/StringUtils.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/StringUtils.java b/java/src/com/android/inputmethod/latin/StringUtils.java
index 4dec7881ba..10aa105e43 100644
--- a/java/src/com/android/inputmethod/latin/StringUtils.java
+++ b/java/src/com/android/inputmethod/latin/StringUtils.java
@@ -220,7 +220,7 @@ public final class StringUtils {
public static int getCapsMode(CharSequence cs, int reqModes) {
int i;
char c;
- int mode = 0;
+ int mode = TextUtils.CAP_MODE_CHARACTERS;
// Quick description of what we want to do:
// CAP_MODE_CHARACTERS is always on.
@@ -235,13 +235,10 @@ public final class StringUtils {
// periods interleaved.
// Step 1 : check for cap mode characters. If it's looked for, it's always on.
- if ((reqModes & TextUtils.CAP_MODE_CHARACTERS) != 0) {
- mode |= TextUtils.CAP_MODE_CHARACTERS;
- }
if ((reqModes & (TextUtils.CAP_MODE_WORDS | TextUtils.CAP_MODE_SENTENCES)) == 0) {
// Here we are not looking for words or sentences modes, so since we already evaluated
// mode characters, we can return.
- return mode;
+ return mode & reqModes;
}
// Step 2 : Skip (ignore at the end of input) any opening punctuation. This includes
--
GitLab