summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/search
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2014-11-03 17:40:38 -0800
committerTarun Nainani <tnainani@codeaurora.org>2014-11-17 22:49:36 -0800
commitac7245633132758808390b9d98b11af3114b3143 (patch)
treeb45ab252bce0d4519362a89f8f61a1e1d8d0c217 /src/com/android/browser/search
parent632e5a00cb521b146e59f13acca14d5d37734421 (diff)
downloadandroid_packages_apps_Gello-ac7245633132758808390b9d98b11af3114b3143.tar.gz
android_packages_apps_Gello-ac7245633132758808390b9d98b11af3114b3143.tar.bz2
android_packages_apps_Gello-ac7245633132758808390b9d98b11af3114b3143.zip
Add fallback mechanism for resources resolved via introspection.
In case of resources not resolve from hard-coded 'com.android.browser.R' package name, fallback on resolving it from dynamically queried package name. Change-Id: Ifb9ca330ba8efd200ce3ccb116fa9aa3e52fb885
Diffstat (limited to 'src/com/android/browser/search')
-rw-r--r--src/com/android/browser/search/SearchEngineInfo.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/browser/search/SearchEngineInfo.java b/src/com/android/browser/search/SearchEngineInfo.java
index ec304f64..f0b478bd 100644
--- a/src/com/android/browser/search/SearchEngineInfo.java
+++ b/src/com/android/browser/search/SearchEngineInfo.java
@@ -61,10 +61,13 @@ public class SearchEngineInfo {
*/
public SearchEngineInfo(Context context, String name) throws IllegalArgumentException {
mName = name;
- Resources res = context.getResources();
+ final Resources res = context.getResources();
String packageName = R.class.getPackage().getName();
int id_data = res.getIdentifier(name, "array", packageName);
+ if(id_data == 0) {
+ id_data = res.getIdentifier(name, "array", context.getPackageName());
+ }
if (id_data == 0) {
throw new IllegalArgumentException("No resources found for " + name);
}