summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/search
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2011-02-23 12:01:13 +0000
committerNarayan Kamath <narayan@google.com>2011-03-02 18:10:21 +0000
commit80aad8d851601d39f73214c198111ca49e25f654 (patch)
treef0f859bcd85f8f203243404165034038637e75a5 /src/com/android/browser/search
parent2eb1190bdda1d2d53c049aa3f5000af6a150e2ca (diff)
downloadpackages_apps_browser-80aad8d851601d39f73214c198111ca49e25f654.zip
packages_apps_browser-80aad8d851601d39f73214c198111ca49e25f654.tar.gz
packages_apps_browser-80aad8d851601d39f73214c198111ca49e25f654.tar.bz2
Add autocomplete to the browser UrlInputView.
Code and tests based on the google search app. A lot less code would be duplicated if we could somehow override AutoCompleteTextView but that is made impossible by it calling a bunch of stuff in its constructor. To do so would require changes to the existing API. I've verified that the unit test passes, but other browser tests appear to fail - even on a clean branch with none of my changes. Also fixes a minor bug in SearchEngines.getSearchableInfo( ). Change-Id: Ic61bc6b8fa27cd210a45dc181ebf15accf503244
Diffstat (limited to 'src/com/android/browser/search')
-rw-r--r--src/com/android/browser/search/SearchEngineInfo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/browser/search/SearchEngineInfo.java b/src/com/android/browser/search/SearchEngineInfo.java
index 6f0b1d5..af6fa70 100644
--- a/src/com/android/browser/search/SearchEngineInfo.java
+++ b/src/com/android/browser/search/SearchEngineInfo.java
@@ -17,6 +17,7 @@ package com.android.browser.search;
import android.content.Context;
import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
import android.text.TextUtils;
import android.util.Log;
@@ -58,9 +59,12 @@ public class SearchEngineInfo {
*/
public SearchEngineInfo(Context context, String name) throws IllegalArgumentException {
mName = name;
-
Resources res = context.getResources();
+
int id_data = res.getIdentifier(name, "array", context.getPackageName());
+ if (id_data == 0) {
+ throw new IllegalArgumentException("No resources found for " + name);
+ }
mSearchEngineData = res.getStringArray(id_data);
if (mSearchEngineData == null) {