summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-10-20 09:29:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-20 09:29:57 +0000
commitfcb0928256b7e70b019ae263ef3e69f07d2c37ec (patch)
tree4d13f7dc1302f4c3a687e12f0d860302c70dda93
parent1da143940c7bed541aef0f840d295427f9397ca3 (diff)
parent28a64381b67d72fcc8b994343507ed9c5821df53 (diff)
downloadandroid_packages_apps_Trebuchet-fcb0928256b7e70b019ae263ef3e69f07d2c37ec.tar.gz
android_packages_apps_Trebuchet-fcb0928256b7e70b019ae263ef3e69f07d2c37ec.tar.bz2
android_packages_apps_Trebuchet-fcb0928256b7e70b019ae263ef3e69f07d2c37ec.zip
Fixing text search where a word starting with lower case was not being matched
am: 28a64381b6 Change-Id: Ib5158d42219478c97d6bec5049e3354ee1087094
-rw-r--r--src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java2
-rw-r--r--tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
index ac22dd279..06cf9aa71 100644
--- a/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
+++ b/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java
@@ -115,7 +115,7 @@ public class DefaultAppSearchAlgorithm {
return prevType != Character.UPPERCASE_LETTER;
case Character.LOWERCASE_LETTER:
// Break point if previous was not a letter.
- return prevType > Character.OTHER_LETTER;
+ return prevType > Character.OTHER_LETTER || prevType <= Character.UNASSIGNED;
case Character.DECIMAL_DIGIT_NUMBER:
case Character.LETTER_NUMBER:
case Character.OTHER_NUMBER:
diff --git a/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java
index 4d0a7a9bd..18570de5b 100644
--- a/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java
+++ b/tests/src/com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java
@@ -67,6 +67,10 @@ public class DefaultAppSearchAlgorithmTest extends InstrumentationTestCase {
assertTrue(mAlgorithm.matches(getInfo("Q"), "q"));
assertTrue(mAlgorithm.matches(getInfo(" Q"), "q"));
+
+ // match lower case words
+ assertTrue(mAlgorithm.matches(getInfo("elephant"), "e"));
+
}
private AppInfo getInfo(String title) {