diff options
Diffstat (limited to 'src/com/android/launcher3/LauncherAppWidgetHost.java')
-rw-r--r-- | src/com/android/launcher3/LauncherAppWidgetHost.java | 55 |
1 files changed, 49 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java index a309f268c..de7c61000 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHost.java +++ b/src/com/android/launcher3/LauncherAppWidgetHost.java @@ -21,9 +21,12 @@ import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.os.TransactionTooLargeException; +import android.view.LayoutInflater; +import android.view.View; import java.util.ArrayList; + /** * Specific {@link AppWidgetHost} that creates our {@link LauncherAppWidgetHostView} * which correctly captures all long-press events. This ensures that users can @@ -33,16 +36,31 @@ public class LauncherAppWidgetHost extends AppWidgetHost { private final ArrayList<Runnable> mProviderChangeListeners = new ArrayList<Runnable>(); - Launcher mLauncher; + private int mQsbWidgetId = -1; + private Launcher mLauncher; public LauncherAppWidgetHost(Launcher launcher, int hostId) { super(launcher, hostId); mLauncher = launcher; } + public void setQsbWidgetId(int widgetId) { + mQsbWidgetId = widgetId; + } + @Override protected AppWidgetHostView onCreateView(Context context, int appWidgetId, AppWidgetProviderInfo appWidget) { + if (appWidgetId == mQsbWidgetId) { + return new LauncherAppWidgetHostView(context) { + + @Override + protected View getErrorView() { + // For the QSB, show an empty view instead of an error view. + return new View(getContext()); + } + }; + } return new LauncherAppWidgetHostView(context); } @@ -77,12 +95,37 @@ public class LauncherAppWidgetHost extends AppWidgetHost { } protected void onProvidersChanged() { - // Once we get the message that widget packages are updated, we need to rebind items - // in AppsCustomize accordingly. - mLauncher.bindPackagesUpdated(LauncherModel.getSortedWidgetsAndShortcuts(mLauncher)); + mLauncher.getModel().loadAndBindWidgetsAndShortcuts(mLauncher, mLauncher, + true /* refresh */); + if (!mProviderChangeListeners.isEmpty()) { + for (Runnable callback : new ArrayList<>(mProviderChangeListeners)) { + callback.run(); + } + } + } - for (Runnable callback : mProviderChangeListeners) { - callback.run(); + public AppWidgetHostView createView(Context context, int appWidgetId, + LauncherAppWidgetProviderInfo appWidget) { + if (appWidget.isCustomWidget) { + LauncherAppWidgetHostView lahv = new LauncherAppWidgetHostView(context); + LayoutInflater inflater = (LayoutInflater) + context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + inflater.inflate(appWidget.initialLayout, lahv); + lahv.setAppWidget(0, appWidget); + lahv.updateLastInflationOrientation(); + return lahv; + } else { + return super.createView(context, appWidgetId, appWidget); } } + + /** + * Called when the AppWidget provider for a AppWidget has been upgraded to a new apk. + */ + @Override + protected void onProviderChanged(int appWidgetId, AppWidgetProviderInfo appWidget) { + LauncherAppWidgetProviderInfo info = LauncherAppWidgetProviderInfo.fromProviderInfo( + mLauncher, appWidget); + super.onProviderChanged(appWidgetId, info); + } } |