commit 213f8396f731cb5238b03aeda4d2538a7d64673d
author Sam Blitzstein <sblitz@google.com> Tue Apr 16 01:56:44 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 16 01:56:44 2013 +0000
tree de857f89c776fa3c667d54601ee0461a4a16b87a
parent ddbd05848758de90c61f2e4057ab496ab26bf0c1
parent 020b0c4329f432946df13a43a2831be0ee3b32cd

Merge "Allow all words in country name to be searched." into jb-mr2-dev

src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java

diff --git a/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java b/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java
index 65bd530..ffc699b 100644
--- a/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java
+++ b/src/com/android/timezonepicker/TimeZoneFilterTypeAdapter.java
@@ -209,9 +209,22 @@
                 // TODO Perf - cache toLowerCase()?
                 if (!TextUtils.isEmpty(country)) {
                     final String lowerCaseCountry = country.toLowerCase();
+                    boolean isMatch = false;
                     if (lowerCaseCountry.startsWith(prefixString)
                             || (lowerCaseCountry.charAt(0) == prefixString.charAt(0) &&
                             isStartingInitialsFor(prefixString, lowerCaseCountry))) {
+                        isMatch = true;
+                    } else if (lowerCaseCountry.contains(" ")){
+                        // We should also search other words in the country name, so that
+                        // searches like "Korea" yield "South Korea".
+                        for (String word : lowerCaseCountry.split(" ")) {
+                            if (word.startsWith(prefixString)) {
+                                isMatch = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (isMatch) {
                         filtered.add(new FilterTypeResult(FILTER_TYPE_COUNTRY, country, 0));
                     }
                 }