Set default widgets and all widgets separately from standalone activity (8654ff01) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/WidgetPickerActivity.java

+83 −61

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.appwidget.AppWidgetManager;
		import android.appwidget.AppWidgetProviderInfo;
		import android.content.ClipData;
		import android.content.ClipDescription;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.util.Log;
		@@ -60,6 +61,7 @@ import java.util.Locale;
		import java.util.Map;
		import java.util.Set;
		import java.util.function.Function;
		import java.util.function.Predicate;
		import java.util.regex.Pattern;
		import java.util.stream.Collectors;

		@@ -128,9 +130,23 @@ public class WidgetPickerActivity extends BaseActivity {
		/** A set of user ids that should be filtered out from the selected widgets. */
		@NonNull
		Set<Integer> mFilteredUserIds = new HashSet<>();

		@Nullable
		private WidgetsFullSheet mWidgetSheet;

		private final Predicate<WidgetItem> mWidgetsFilter = widget -> {
		final WidgetAcceptabilityVerdict verdict =
		isWidgetAcceptable(widget, /* applySizeFilter=*/ false);
		verdict.maybeLogVerdict();
		return verdict.isAcceptable;
		};
		private final Predicate<WidgetItem> mDefaultWidgetsFilter = widget -> {
		final WidgetAcceptabilityVerdict verdict =
		isWidgetAcceptable(widget, /* applySizeFilter=*/ true);
		verdict.maybeLogVerdict();
		return verdict.isAcceptable;
		};

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		@@ -276,18 +292,15 @@ public class WidgetPickerActivity extends BaseActivity {
		private void refreshAndBindWidgets() {
		MODEL_EXECUTOR.execute(() -> {
		LauncherAppState app = LauncherAppState.getInstance(this);
		Context context = app.getContext();

		mModel.update(app, null);
		final List<WidgetsListBaseEntry> allWidgets =
		mModel.getFilteredWidgetsListForPicker(
		app.getContext(),
		/widgetItemFilter=/ widget -> {
		final WidgetAcceptabilityVerdict verdict =
		isWidgetAcceptable(widget);
		verdict.maybeLogVerdict();
		return verdict.isAcceptable;
		}
		);
		bindWidgets(allWidgets);
		mModel.getFilteredWidgetsListForPicker(context, mWidgetsFilter);
		final List<WidgetsListBaseEntry> defaultWidgets =
		shouldShowDefaultWidgets() ? mModel.getFilteredWidgetsListForPicker(context,
		mDefaultWidgetsFilter) : List.of();
		bindWidgets(allWidgets, defaultWidgets);
		// Open sheet once widgets are available, so that it doesn't interrupt the open
		// animation.
		openWidgetsSheet();
		@@ -307,8 +320,9 @@ public class WidgetPickerActivity extends BaseActivity {
		});
		}

		private void bindWidgets(List<WidgetsListBaseEntry> widgets) {
		MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setAllWidgets(widgets));
		private void bindWidgets(List<WidgetsListBaseEntry> allWidgets,
		List<WidgetsListBaseEntry> defaultWidgets) {
		MAIN_EXECUTOR.execute(() -> mPopupDataProvider.setAllWidgets(allWidgets, defaultWidgets));
		}

		private void openWidgetsSheet() {
		@@ -380,7 +394,13 @@ public class WidgetPickerActivity extends BaseActivity {
		}
		};

		private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget) {
		private boolean shouldShowDefaultWidgets() {
		// If optional filters such as size filter are present, we display them as default widgets.
		return mDesiredWidgetWidth != 0 \|\| mDesiredWidgetHeight != 0;
		}

		private WidgetAcceptabilityVerdict isWidgetAcceptable(WidgetItem widget,
		boolean applySizeFilter) {
		final AppWidgetProviderInfo info = widget.widgetInfo;
		if (info == null) {
		return rejectWidget(widget, "shortcut");
		@@ -401,6 +421,7 @@ public class WidgetPickerActivity extends BaseActivity {
		info.widgetCategory);
		}

		if (applySizeFilter) {
		if (mDesiredWidgetWidth == 0 && mDesiredWidgetHeight == 0) {
		// Accept the widget if the desired dimensions are unspecified.
		return acceptWidget(widget);
		@@ -457,6 +478,7 @@ public class WidgetPickerActivity extends BaseActivity {
		if (!isHorizontallyResizable \|\| !isVerticallyResizable) {
		return rejectWidget(widget, "not resizeable");
		}
		}

		return acceptWidget(widget);
		}

src/com/android/launcher3/popup/PopupDataProvider.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,11 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan

		/** All installed widgets. */
		private List<WidgetsListBaseEntry> mAllWidgets = List.of();
		/**
		* Selectively chosen installed widgets which may be preferred for default display over the list
		* of all widgets.
		*/
		private List<WidgetsListBaseEntry> mDefaultWidgets = List.of();
		/** Widgets that can be recommended to the users. */
		private List<ItemInfo> mRecommendedWidgets = List.of();

		@@ -194,6 +199,18 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan

		public void setAllWidgets(List<WidgetsListBaseEntry> allWidgets) {
		mAllWidgets = allWidgets;
		mDefaultWidgets = List.of();
		mChangeListener.onWidgetsBound();
		}

		/**
		* Sets the list of widgets to be displayed by default and a complete list that can be displayed
		* when user chooses to show all widgets.
		*/
		public void setAllWidgets(List<WidgetsListBaseEntry> allWidgets,
		List<WidgetsListBaseEntry> defaultWidgets) {
		mAllWidgets = allWidgets;
		mDefaultWidgets = defaultWidgets;
		mChangeListener.onWidgetsBound();
		}

		@@ -205,6 +222,14 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
		return mAllWidgets;
		}

		/**
		* Returns a "selectively" chosen list of widgets that may be preferred to be shown by default
		* instead of a complete list.
		*/
		public List<WidgetsListBaseEntry> getDefaultWidgets() {
		return mDefaultWidgets;
		}

		/** Returns a list of recommended widgets. */
		public List<WidgetItem> getRecommendedWidgets() {
		HashMap<ComponentKey, WidgetItem> allWidgetItems = new HashMap<>();