aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Route PredictedAppIcon clicks through launcher" into udc-dev

Browse Source
This commit is contained in:
Vinit Nayak
2023-04-25 23:20:41 +00:00
committed by Android (Google) Code Review
parent 773c5c1760 1bb594c72b
commit 80a3213d6b
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
View File

@@ -402,8 +402,9 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
PredictedAppIcon icon = (PredictedAppIcon) LayoutInflater.from(parent.getContext())
.inflate(R.layout.predicted_app_icon, parent, false);
icon.applyFromWorkspaceItem(info);
icon.setOnClickListener(ItemClickHandler.INSTANCE);
icon.setOnFocusChangeListener(Launcher.getLauncher(parent.getContext()).getFocusHandler());
Launcher launcher = Launcher.getLauncher(parent.getContext());
icon.setOnClickListener(launcher.getItemOnClickListener());
icon.setOnFocusChangeListener(launcher.getFocusHandler());
return icon;
}

2
src/com/android/launcher3/folder/FolderIcon.java
View File

@@ -205,7 +205,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;
icon.setTag(folderInfo);
icon.setOnClickListener(ItemClickHandler.INSTANCE);
icon.setOnClickListener(activity.getItemOnClickListener());
icon.mInfo = folderInfo;
icon.mActivity = activity;
icon.mDotRenderer = grid.mDotRendererWorkSpace;

2
src/com/android/launcher3/folder/FolderPagedView.java
View File

@@ -216,7 +216,7 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli
final BubbleTextView textView = mViewCache.getView(
R.layout.folder_application, getContext(), null);
textView.applyFromWorkspaceItem(item);
textView.setOnClickListener(ItemClickHandler.INSTANCE);
textView.setOnClickListener(mFolder.mActivityContext.getItemOnClickListener());
textView.setOnLongClickListener(mFolder);
textView.setOnFocusChangeListener(mFocusIndicatorHelper);
CellLayoutLayoutParams lp = (CellLayoutLayoutParams) textView.getLayoutParams();

2
src/com/android/launcher3/widget/PendingAppWidgetHostView.java
View File

@@ -86,7 +86,7 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView
setWillNotDraw(false);
super.updateAppWidget(null);
setOnClickListener(ItemClickHandler.INSTANCE);
setOnClickListener(mLauncher.getItemOnClickListener());
if (info.pendingItemInfo == null) {
info.pendingItemInfo = new PackageItemInfo(info.providerName.getPackageName(),