Merge "Make getWidgetProviderInfoByProviderName return the correct WidgetItem... (a67a53ee) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ public class LauncherPreviewRenderer extends ContextWrapper

		private void inflateAndAddWidgets(LauncherAppWidgetInfo info, WidgetsModel widgetsModel) {
		WidgetItem widgetItem = widgetsModel.getWidgetProviderInfoByProviderName(
		info.providerName, info.user);
		info.providerName, info.user, mContext);
		if (widgetItem == null) {
		return;
		}

+37 −12

Original line number	Diff line number	Diff line
		@@ -239,20 +239,45 @@ public class WidgetsModel {
		}
		}

		private PackageItemInfo createPackageItemInfo(
		ComponentName providerName,
		UserHandle user,
		int category
		) {
		if (category == NO_CATEGORY) {
		return new PackageItemInfo(providerName.getPackageName(), user);
		} else {
		return new PackageItemInfo("" , category, user);
		}
		}

		private IntSet getCategories(ComponentName providerName, Context context) {
		IntSet categories = WidgetSections.getWidgetsToCategory(context).get(providerName);
		if (categories != null) {
		return categories;
		}
		categories = new IntSet();
		categories.add(NO_CATEGORY);
		return categories;
		}

		public WidgetItem getWidgetProviderInfoByProviderName(
		ComponentName providerName, UserHandle user) {
		ComponentName providerName, UserHandle user, Context context) {
		if (!WIDGETS_ENABLED) {
		return null;
		}
		List<WidgetItem> widgetsList = mWidgetsList.get(
		new PackageItemInfo(providerName.getPackageName(), user));
		if (widgetsList == null) {
		return null;
		}

		for (WidgetItem item : widgetsList) {
		if (item.componentName.equals(providerName)) {
		return item;
		IntSet categories = getCategories(providerName, context);

		// Checking if we have a provider in any of the categories.
		for (Integer category: categories) {
		PackageItemInfo key = createPackageItemInfo(providerName, user, category);
		List<WidgetItem> widgets = mWidgetsList.get(key);
		if (widgets != null) {
		return widgets.stream().filter(
		item -> item.componentName.equals(providerName)
		)
		.findFirst()
		.orElse(null);
		}
		}
		return null;