commit 788000b0ecb8a33812e2be8bdd8d22e14bb23597
author Sunny Goyal <sunnygoyal@google.com> Wed Jul 12 18:01:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 12 18:01:48 2017 +0000
tree 6eb56f405da708afc6ec7f4e1ae5b51a291a4340
parent 52c656d77ce4e3ca95314aad3eaa7887c6c8796f
parent fa5511133a6bf784955042966162e8635ab5b930

Merge "Launcher3: Can't search out local app by Chinese" am: 7c35c64a9d
am: fa5511133a

Change-Id: I038c5fd274afef1625c0d0a05ebe9bd9de67596e

src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java

diff --git a/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
index 06cf9aa..136d369 100644
--- a/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
@@ -130,7 +130,8 @@
                 // Always a break point for a symbol
                 return true;
             default:
-                return false;
+                // Always a break point at first character
+                return  prevType == Character.UNASSIGNED;
         }
     }
 }

tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java

diff --git a/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java
index 18570de..e9c2ebc 100644
--- a/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java
+++ b/tests/src/com/android/launcher3/allapps/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) {