From 1d439df9b1dfd6d6cb32c99eb56998f8b7e6a758 Mon Sep 17 00:00:00 2001 From: Willie Koomson Date: Fri, 5 Apr 2024 01:08:56 +0000 Subject: [PATCH] Show add button when WidgetCell text is tapped This change adds the click listener to the cell itself as well as the preview, so that clicks anywhere in the cell will show the add button. Only long clicks on the preview image will start the drag-and-drop (current behavior). Bug: 323886237 Test: manual tap on Widget cell Flag: ACONFIG com.android.launcher3.enable_widget_tap_to_add TEAMFOOD Change-Id: I23b9b1261979971deffcf1132d95bd6a03c92c47 --- src/com/android/launcher3/widget/WidgetsBottomSheet.java | 1 + .../widget/picker/WidgetsListTableViewHolderBinder.java | 1 + .../widget/picker/WidgetsRecommendationTableLayout.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java index 97aa67de33..b14ec4294e 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -216,6 +216,7 @@ public class WidgetsBottomSheet extends BaseWidgetSheet { protected WidgetCell addItemCell(ViewGroup parent) { WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext()) .inflate(R.layout.widget_cell, parent, false); + widget.setOnClickListener(this); View previewContainer = widget.findViewById(R.id.widget_preview_container); previewContainer.setOnClickListener(this); diff --git a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java index a7f778545e..56352ccc9f 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java +++ b/src/com/android/launcher3/widget/picker/WidgetsListTableViewHolderBinder.java @@ -160,6 +160,7 @@ public final class WidgetsListTableViewHolderBinder WidgetCell widget = (WidgetCell) mLayoutInflater.inflate( R.layout.widget_cell, tableRow, false); // set up touch. + widget.setOnClickListener(mIconClickListener); View preview = widget.findViewById(R.id.widget_preview_container); preview.setOnClickListener(mIconClickListener); preview.setOnLongClickListener(mIconLongClickListener); diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index a565780ddf..03af0cb1db 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java @@ -123,6 +123,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { private WidgetCell addItemCell(ViewGroup parent) { WidgetCell widget = (WidgetCell) LayoutInflater.from( getContext()).inflate(R.layout.widget_cell, parent, false); + widget.setOnClickListener(mWidgetCellOnClickListener); View previewContainer = widget.findViewById(R.id.widget_preview_container); previewContainer.setOnClickListener(mWidgetCellOnClickListener);