Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41282a35: EnhancedGoogleSearch overrides GoogleSearch if present.

Browse Source 
Merge commit '41282a35568b51270440450c46bb31aa00e52caa'

* commit '41282a35568b51270440450c46bb31aa00e52caa':
  EnhancedGoogleSearch overrides GoogleSearch if present.
This commit is contained in:
Satish Sampath
2009-06-23 14:18:21 -07:00
committed by The Android Open Source Project
parent cf01aa3cff 41282a3556
commit f86a58ff3d
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/server/search/Searchables.java
View File

@@ -57,6 +57,11 @@ public class Searchables {
private SearchableInfo mDefaultSearchable = null;
private SearchableInfo mDefaultSearchableForWebSearch = null;
public static String GOOGLE_SEARCH_COMPONENT_NAME =
"com.android.googlesearch/.GoogleSearch";
public static String ENHANCED_GOOGLE_SEARCH_COMPONENT_NAME =
"com.google.android.providers.enhancedgooglesearch/.Launcher";
/**
*
* @param context Context to use for looking up activities etc.
@@ -341,6 +346,18 @@ public class Searchables {
return component;
}
}
} else {
// If the current preferred activity is GoogleSearch, and we detect
// EnhancedGoogleSearch installed as well, set the latter as preferred since that
// is a superset and provides more functionality.
ComponentName cn = new ComponentName(ri.activityInfo.packageName, ri.activityInfo.name);
if (cn.flattenToShortString().equals(GOOGLE_SEARCH_COMPONENT_NAME)) {
ComponentName enhancedGoogleSearch = ComponentName.unflattenFromString(
ENHANCED_GOOGLE_SEARCH_COMPONENT_NAME);
if (setPreferredActivity(enhancedGoogleSearch, Intent.ACTION_WEB_SEARCH)) {
return enhancedGoogleSearch;
}
}
}
if (ri == null) return null;