diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-12 18:03:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 18:03:49 +0000 |
commit | db19e3fcb16f54a64b1a0b78cea408fe746b018f (patch) | |
tree | 42ac859a9e6d5306e17bd3f3c9f482caec500bc9 /src/com/android/launcher3/LauncherProvider.java | |
parent | a72683009e0d51614e5b3028c18a1e479febcf1f (diff) | |
parent | b155bbb375c6bfed14f79def122d69c7659434f7 (diff) | |
download | android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.tar.gz android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.tar.bz2 android_packages_apps_Trebuchet-db19e3fcb16f54a64b1a0b78cea408fe746b018f.zip |
am b155bbb3: Merge "Using the default search widget in Launcher3" into ub-now-queens
* commit 'b155bbb375c6bfed14f79def122d69c7659434f7':
Using the default search widget in Launcher3
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 365d989bf..cadc06eef 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -16,7 +16,6 @@ package com.android.launcher3; -import android.app.SearchManager; import android.appwidget.AppWidgetHost; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProviderInfo; @@ -57,7 +56,6 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.List; public class LauncherProvider extends ContentProvider { private static final String TAG = "Launcher.LauncherProvider"; @@ -1342,29 +1340,8 @@ public class LauncherProvider extends ContentProvider { } 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; + AppWidgetProviderInfo searchProvider = Utilities.getSearchWidgetProvider(mContext); + return (searchProvider == null) ? null : searchProvider.provider; } private void migrateLauncher2Shortcuts(SQLiteDatabase db, Uri uri) { |