Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80a3213d authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

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

parents 773c5c17 1bb594c7

quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/launcher3/folder/FolderIcon.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

src/com/android/launcher3/folder/FolderPagedView.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/launcher3/widget/PendingAppWidgetHostView.java

+1 −1
Original line number Diff line number Diff line
@@ -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(),