diff options
author | Bjorn Bringert <bringert@android.com> | 2010-01-14 13:26:43 +0000 |
---|---|---|
committer | Bjorn Bringert <bringert@android.com> | 2010-01-14 15:12:04 +0000 |
commit | cd8fec02810ac2d7ca97c4cbb41e37dace832ecb (patch) | |
tree | caa4bf3d3120c6f48f5b0d6f9aa966c45c42b17b /src/com/android/launcher2/LauncherProvider.java | |
parent | 629de3ef739883c0962423cc0c3a26299f162d3d (diff) | |
download | android_packages_apps_Trebuchet-cd8fec02810ac2d7ca97c4cbb41e37dace832ecb.tar.gz android_packages_apps_Trebuchet-cd8fec02810ac2d7ca97c4cbb41e37dace832ecb.tar.bz2 android_packages_apps_Trebuchet-cd8fec02810ac2d7ca97c4cbb41e37dace832ecb.zip |
Don't hardcode component name for search widget
Note that this does not convert any widgets what were bound when
a different global search app was installed. Thus Froyo -> Froyo
upgrades without userdata wipe will see "Problem loading widget".
Workaround: Remove the search widget and add a new one.
Change-Id: I2bcd211c10bbaba66f5f3f82b6785396d957aa25
Diffstat (limited to 'src/com/android/launcher2/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher2/LauncherProvider.java | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java index ed1c72c49..f03e50c99 100644 --- a/src/com/android/launcher2/LauncherProvider.java +++ b/src/com/android/launcher2/LauncherProvider.java @@ -16,8 +16,10 @@ package com.android.launcher2; +import android.app.SearchManager; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; import android.content.ContentProvider; import android.content.Context; import android.content.ContentValues; @@ -46,6 +48,7 @@ import android.provider.Settings; import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.List; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParser; @@ -527,8 +530,7 @@ public class LauncherProvider extends ContentProvider { "com.android.camera.PhotoAppWidgetProvider")); } else if (favoriteType == Favorites.ITEM_TYPE_WIDGET_SEARCH) { appWidgetManager.bindAppWidgetId(appWidgetId, - new ComponentName("com.android.quicksearchbox", - "com.android.quicksearchbox.SearchWidgetProvider")); + getSearchWidgetProvider()); } } catch (RuntimeException ex) { Log.e(TAG, "Problem allocating appWidgetId", ex); @@ -639,9 +641,34 @@ public class LauncherProvider extends ContentProvider { return true; } + private ComponentName getSearchWidgetProvider() { + SearchManager searchManager = + (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE); + ComponentName searchComponent = searchManager.getGlobalSearchActivity(); + if (searchComponent == null) return null; + return getProviderInPackage(searchComponent.getPackageName()); + } + + /** + * Gets an appwidget provider from the given package. If the package contains more than + * one appwidget provider, an arbitrary one is returned. + */ + private ComponentName getProviderInPackage(String packageName) { + AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext); + List<AppWidgetProviderInfo> providers = appWidgetManager.getInstalledProviders(); + if (providers == null) return null; + final int providerCount = providers.size(); + for (int i = 0; i < providerCount; i++) { + ComponentName provider = providers.get(i).provider; + if (provider != null && provider.getPackageName().equals(packageName)) { + return provider; + } + } + return null; + } + private boolean addSearchWidget(SQLiteDatabase db, ContentValues values) { - ComponentName cn = new ComponentName("com.android.quicksearchbox", - "com.android.quicksearchbox.SearchWidgetProvider"); + ComponentName cn = getSearchWidgetProvider(); return addAppWidget(db, values, cn, 4, 1); } |