Track search results with position and search Identifier (f0106495) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+30 −17

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ public class AllAppsGridAdapter extends
		*/
		public static class AdapterItemWithPayload<T> extends AdapterItem {
		private T mPayload;
		private String mSearchSessionId;
		private AllAppsSearchPlugin mPlugin;
		private IntConsumer mSelectionHandler;

		@@ -221,6 +222,14 @@ public class AllAppsGridAdapter extends
		mSelectionHandler = runnable;
		}

		public void setSearchSessionId(String searchSessionId) {
		mSearchSessionId = searchSessionId;
		}

		public String getSearchSessionId() {
		return mSearchSessionId;
		}

		public IntConsumer getSelectionHandler() {
		return mSelectionHandler;
		}
		@@ -228,6 +237,8 @@ public class AllAppsGridAdapter extends
		public T getPayload() {
		return mPayload;
		}


		}

		/**
		@@ -476,24 +487,23 @@ public class AllAppsGridAdapter extends
		//TODO: replace with custom TopHitBubbleTextView with support for both shortcut
		// and apps
		if (adapterItem instanceof AdapterItemWithPayload) {
		AdapterItemWithPayload withPayload = (AdapterItemWithPayload) adapterItem;
		IntConsumer selectionHandler = type -> {
		AdapterItemWithPayload item = (AdapterItemWithPayload) adapterItem;
		item.setSelectionHandler(type -> {
		SearchTargetEvent e = new SearchTargetEvent(SearchTarget.ItemType.APP,
		type);
		type, item.position, item.getSearchSessionId());
		e.bundle = HeroSearchResultView.getAppBundle(info);
		if (withPayload.getPlugin() != null) {
		withPayload.getPlugin().notifySearchTargetEvent(e);
		if (item.getPlugin() != null) {
		item.getPlugin().notifySearchTargetEvent(e);
		}
		};
		});
		icon.setOnClickListener(view -> {
		selectionHandler.accept(SearchTargetEvent.SELECT);
		item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
		mOnIconClickListener.onClick(view);
		});
		icon.setOnLongClickListener(view -> {
		selectionHandler.accept(SearchTargetEvent.LONG_PRESS);
		item.getSelectionHandler().accept(SearchTargetEvent.SELECT);
		return mOnIconLongClickListener.onLongClick(view);
		});
		withPayload.setSelectionHandler(selectionHandler);
		}
		else {
		icon.setOnClickListener(mOnIconClickListener);
		@@ -516,20 +526,22 @@ public class AllAppsGridAdapter extends
		break;
		case VIEW_TYPE_SEARCH_SLICE:
		SliceView sliceView = (SliceView) holder.itemView;
		AdapterItemWithPayload<Uri> item =
		AdapterItemWithPayload<Uri> slicePayload =
		(AdapterItemWithPayload<Uri>) mApps.getAdapterItems().get(position);
		sliceView.setOnSliceActionListener((info1, s) -> {
		if (item.getPlugin() != null) {
		if (slicePayload.getPlugin() != null) {
		SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
		SearchTarget.ItemType.SETTINGS_SLICE,
		SearchTargetEvent.CHILD_SELECT);
		SearchTargetEvent.CHILD_SELECT, slicePayload.position,
		slicePayload.getSearchSessionId());
		searchTargetEvent.bundle = new Bundle();
		searchTargetEvent.bundle.putParcelable("uri", item.getPayload());
		item.getPlugin().notifySearchTargetEvent(searchTargetEvent);
		searchTargetEvent.bundle.putParcelable("uri", slicePayload.getPayload());
		slicePayload.getPlugin().notifySearchTargetEvent(searchTargetEvent);
		}
		});
		try {
		LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher, item.getPayload());
		LiveData<Slice> liveData = SliceLiveData.fromUri(mLauncher,
		slicePayload.getPayload());
		liveData.observe((Launcher) mLauncher, sliceView);
		sliceView.setTag(liveData);
		} catch (Exception ignored) {
		@@ -542,9 +554,10 @@ public class AllAppsGridAdapter extends
		case VIEW_TYPE_SEARCH_SHORTCUT:
		case VIEW_TYPE_SEARCH_PEOPLE:
		case VIEW_TYPE_SEARCH_THUMBNAIL:
		AdapterItemWithPayload item =
		(AdapterItemWithPayload) mApps.getAdapterItems().get(position);
		PayloadResultHandler payloadResultView = (PayloadResultHandler) holder.itemView;
		payloadResultView.applyAdapterInfo(
		(AdapterItemWithPayload) mApps.getAdapterItems().get(position));
		payloadResultView.setup(item);
		break;
		case VIEW_TYPE_ALL_APPS_DIVIDER:
		// nothing to do

src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java

+40 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ import com.android.launcher3.allapps.AllAppsGridAdapter.AdapterItemWithPayload;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.util.PackageManagerHelper;
		import com.android.systemui.plugins.AllAppsSearchPlugin;
		import com.android.systemui.plugins.shared.SearchTarget;
		import com.android.systemui.plugins.shared.SearchTargetEvent;

		import java.util.ArrayList;
		import java.util.List;
		@@ -213,6 +215,44 @@ public class AllAppsSearchBarController
		/**
		* Updates View using Adapter's payload
		*/

		default void setup(AdapterItemWithPayload<T> adapterItemWithPayload) {
		Object[] targetInfo = getTargetInfo();
		if (targetInfo != null) {
		targetInfo[0] = adapterItemWithPayload.getSearchSessionId();
		targetInfo[1] = adapterItemWithPayload.position;
		}
		applyAdapterInfo(adapterItemWithPayload);
		}

		void applyAdapterInfo(AdapterItemWithPayload<T> adapterItemWithPayload);

		/**
		* Gets object created by {@link PayloadResultHandler#createTargetInfo()}
		*/
		Object[] getTargetInfo();

		/**
		* Creates a wrapper object to hold searchSessionId and item position
		*/
		default Object[] createTargetInfo() {
		return new Object[2];
		}

		/**
		* Generates a SearchTargetEvent object for a PayloadHandlerView
		*/
		default SearchTargetEvent getSearchTargetEvent(SearchTarget.ItemType itemType,
		int eventType) {
		Object[] targetInfo = getTargetInfo();
		if (targetInfo == null) return null;

		String searchSessionId = (String) targetInfo[0];
		int position = (int) targetInfo[1];
		return new SearchTargetEvent(itemType, eventType,
		position, searchSessionId);
		}
		}


		}
		No newline at end of file

src/com/android/launcher3/views/HeroSearchResultView.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
		PayloadResultHandler<List<Pair<ShortcutInfo, ItemInfoWithIcon>>> {

		public static final int MAX_SHORTCUTS_COUNT = 2;
		private final Object[] mTargetInfo = createTargetInfo();
		BubbleTextView mBubbleTextView;
		View mIconView;
		BubbleTextView[] mDeepShortcutTextViews = new BubbleTextView[2];
		@@ -107,7 +108,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
		grid.allAppsIconSizePx));
		bubbleTextView.setOnClickListener(view -> {
		WorkspaceItemInfo itemInfo = (WorkspaceItemInfo) bubbleTextView.getTag();
		SearchTargetEvent event = new SearchTargetEvent(
		SearchTargetEvent event = getSearchTargetEvent(
		SearchTarget.ItemType.APP_HERO,
		SearchTargetEvent.CHILD_SELECT);
		event.bundle = getAppBundle(itemInfo);
		@@ -149,6 +150,11 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
		adapterItem.setSelectionHandler(this::handleSelection);
		}

		@Override
		public Object[] getTargetInfo() {
		return mTargetInfo;
		}

		@Override
		public void onDropCompleted(View target, DropTarget.DragObject d, boolean success) {
		mBubbleTextView.setVisibility(VISIBLE);
		@@ -184,7 +190,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
		mLauncher.getWorkspace().beginDragShared(mContainer.mBubbleTextView,
		draggableView, mContainer, itemInfo, previewProvider, new DragOptions());

		SearchTargetEvent event = new SearchTargetEvent(
		SearchTargetEvent event = mContainer.getSearchTargetEvent(
		SearchTarget.ItemType.APP_HERO, SearchTargetEvent.LONG_PRESS);
		event.bundle = getAppBundle(itemInfo);
		if (mContainer.mPlugin != null) {
		@@ -201,7 +207,7 @@ public class HeroSearchResultView extends LinearLayout implements DragSource,
		Launcher launcher = Launcher.getLauncher(getContext());
		launcher.startActivitySafely(this, itemInfo.getIntent(), itemInfo);

		SearchTargetEvent event = new SearchTargetEvent(
		SearchTargetEvent event = getSearchTargetEvent(
		SearchTarget.ItemType.APP_HERO, eventType);
		event.bundle = getAppBundle(itemInfo);
		if (mPlugin != null) {

src/com/android/launcher3/views/SearchResultPeopleView.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public class SearchResultPeopleView extends LinearLayout implements
		private ImageButton[] mProviderButtons = new ImageButton[3];
		private AllAppsSearchPlugin mPlugin;
		private Uri mContactUri;

		private final Object[] mTargetInfo = createTargetInfo();

		public SearchResultPeopleView(Context context) {
		this(context, null, 0);
		@@ -129,7 +129,7 @@ public class SearchResultPeopleView extends LinearLayout implements
		Bundle provider = providers.get(i);
		Intent intent = Intent.parseUri(provider.getString("intent_uri_str"),
		URI_ANDROID_APP_SCHEME \| URI_ALLOW_UNSAFE);
		setupProviderButton(button, provider, intent);
		setupProviderButton(button, provider, intent, adapterItemWithPayload);
		String pkg = provider.getString("package_name");
		UI_HELPER_EXECUTOR.post(() -> {
		try {
		@@ -151,11 +151,17 @@ public class SearchResultPeopleView extends LinearLayout implements
		adapterItemWithPayload.setSelectionHandler(this::handleSelection);
		}

		private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) {
		@Override
		public Object[] getTargetInfo() {
		return mTargetInfo;
		}

		private void setupProviderButton(ImageButton button, Bundle provider, Intent intent,
		AllAppsGridAdapter.AdapterItem adapterItem) {
		Launcher launcher = Launcher.getLauncher(getContext());
		button.setOnClickListener(b -> {
		launcher.startActivitySafely(b, intent, null);
		SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
		SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
		SearchTarget.ItemType.PEOPLE,
		SearchTargetEvent.CHILD_SELECT);
		searchTargetEvent.bundle = new Bundle();
		@@ -173,8 +179,8 @@ public class SearchResultPeopleView extends LinearLayout implements
		Launcher launcher = Launcher.getLauncher(getContext());
		launcher.startActivitySafely(this, new Intent(Intent.ACTION_VIEW, mContactUri).setFlags(
		Intent.FLAG_ACTIVITY_NEW_TASK), null);
		SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
		SearchTarget.ItemType.PEOPLE, eventType);
		SearchTargetEvent searchTargetEvent = getSearchTargetEvent(SearchTarget.ItemType.PEOPLE,
		eventType);
		searchTargetEvent.bundle = new Bundle();
		searchTargetEvent.bundle.putParcelable("contact_uri", mContactUri);
		if (mPlugin != null) {

src/com/android/launcher3/views/SearchResultPlayItem.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ public class SearchResultPlayItem extends LinearLayout implements
		private String mPackageName;
		private boolean mIsInstantGame;
		private AllAppsSearchPlugin mPlugin;
		private final Object[] mTargetInfo = createTargetInfo();


		public SearchResultPlayItem(Context context) {
		this(context, null, 0);
		@@ -125,6 +127,11 @@ public class SearchResultPlayItem extends LinearLayout implements
		});
		}

		@Override
		public Object[] getTargetInfo() {
		return mTargetInfo;
		}

		private void showIfNecessary(TextView textView, @Nullable String string) {
		if (string == null \|\| string.isEmpty()) {
		textView.setVisibility(GONE);
		@@ -160,7 +167,7 @@ public class SearchResultPlayItem extends LinearLayout implements
		}

		private void logSearchEvent(int eventType) {
		SearchTargetEvent searchTargetEvent = new SearchTargetEvent(
		SearchTargetEvent searchTargetEvent = getSearchTargetEvent(
		SearchTarget.ItemType.PLAY_RESULTS, eventType);
		searchTargetEvent.bundle = new Bundle();
		searchTargetEvent.bundle.putString("package_name", mPackageName);