Merge "Remove an unused function (A8)" into jb-mr1-dev
diff --git a/java/src/com/android/inputmethod/latin/StringUtils.java b/java/src/com/android/inputmethod/latin/StringUtils.java
index b4f3b4b..52fda04 100644
--- a/java/src/com/android/inputmethod/latin/StringUtils.java
+++ b/java/src/com/android/inputmethod/latin/StringUtils.java
@@ -125,23 +125,6 @@
}
/**
- * Returns true if cs contains any upper case characters.
- *
- * @param cs the CharSequence to check
- * @return {@code true} if cs contains any upper case characters, {@code false} otherwise.
- */
- public static boolean hasUpperCase(final CharSequence cs) {
- final int length = cs.length();
- for (int i = 0, cp = 0; i < length; i += Character.charCount(cp)) {
- cp = Character.codePointAt(cs, i);
- if (Character.isUpperCase(cp)) {
- return true;
- }
- }
- return false;
- }
-
- /**
* Remove duplicates from an array of strings.
*
* This method will always keep the first occurrence of all strings at their position
diff --git a/tests/src/com/android/inputmethod/latin/StringUtilsTests.java b/tests/src/com/android/inputmethod/latin/StringUtilsTests.java
index 0cef28c..c3d9c06 100644
--- a/tests/src/com/android/inputmethod/latin/StringUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/StringUtilsTests.java
@@ -90,17 +90,6 @@
StringUtils.removeFromCsvIfExists("key", "key1,key,key3,key,key5"));
}
- public void testHasUpperCase() {
- assertTrue("single upper-case string", StringUtils.hasUpperCase("String"));
- assertTrue("multi upper-case string", StringUtils.hasUpperCase("stRInG"));
- assertTrue("all upper-case string", StringUtils.hasUpperCase("STRING"));
- assertTrue("upper-case string with non-letters", StringUtils.hasUpperCase("He's"));
-
- assertFalse("empty string", StringUtils.hasUpperCase(""));
- assertFalse("lower-case string", StringUtils.hasUpperCase("string"));
- assertFalse("lower-case string with non-letters", StringUtils.hasUpperCase("he's"));
- }
-
private void onePathForCaps(final CharSequence cs, final int expectedResult, final int mask) {
int oneTimeResult = expectedResult & mask;
assertEquals("After >" + cs + "<", oneTimeResult, StringUtils.getCapsMode(cs, mask));