From 28a64381b67d72fcc8b994343507ed9c5821df53 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 19 Oct 2016 07:53:43 +0100 Subject: Fixing text search where a word starting with lower case was not being matched Bug: 32249413 Change-Id: I0f5e24052759a734fe0df3bd3d0bf2e7ef7f2713 --- src/com/android/launcher3/allapps/DefaultAppSearchAlgorithm.java | 2 +- .../com/android/launcher3/allapps/DefaultAppSearchAlgorithmTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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) { -- cgit v1.2.3