| commit | fdfcf12931a2427d1d7e95a8b79c4baa0047953f | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Jul 12 18:19:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 12 18:19:29 2017 +0000 |
| tree | 33068d9814f58a60723e244f3e57acafde75268c | |
| parent | 6e880ec71607efc3ce2faa3a58992be5209c6db4 [diff] | |
| parent | 29e4a28f8cf8af3e7dc0efe489bb44e8de328cee [diff] |
Merge "Launcher3: Can't search out local app by Chinese" am: 7c35c64a9d am: fa5511133a am: 788000b0ec am: 29e4a28f8c Change-Id: I2ffeab12ebdd4422fb92c263fa7de927bf8bd506
diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java index 8a0fd46..4303302 100644 --- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java +++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java
@@ -132,7 +132,8 @@ // Always a break point for a symbol return true; default: - return false; + // Always a break point at first character + return prevType == Character.UNASSIGNED; } } }
diff --git a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java index 20b23b0..58dc0c4 100644 --- a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java +++ b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java
@@ -71,6 +71,10 @@ // match lower case words assertTrue(mAlgorithm.matches(getInfo("elephant"), "e")); + assertTrue(mAlgorithm.matches(getInfo("电子邮件"), "电")); + assertTrue(mAlgorithm.matches(getInfo("电子邮件"), "电子")); + assertFalse(mAlgorithm.matches(getInfo("电子邮件"), "子")); + assertFalse(mAlgorithm.matches(getInfo("电子邮件"), "邮件")); } private AppInfo getInfo(String title) {