diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-06 10:12:54 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 20:46:52 -0700 |
commit | 5b54994fc56c9d00d415f161457c2c7449af912d (patch) | |
tree | f78f60595d88ca965a5ffc526fcee478026adbf4 /src/com/android/launcher3/LauncherProvider.java | |
parent | 4ca61d13bc2fd0faa18ce76b1f9edf00323ce260 (diff) | |
download | android_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.tar.gz android_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.tar.bz2 android_packages_apps_Trebuchet-5b54994fc56c9d00d415f161457c2c7449af912d.zip |
Using the default search widget in Launcher3
> Removing all logic related to search and voice overlays
from Launcher3
> Using the widget provided by global search provider on the
homescreen
> Removing VoiceButtonProxy, as it is not being used anymore
Change-Id: Ie8b09b44f7213c8fa11bce685914442e4884295d
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 4e1b67345..64912682a 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"; @@ -1422,29 +1420,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) { |