Merge "Fix issue with tap-to-add on recycled WidgetCells" into main

This commit is contained in:
Willie Koomson authored and Android (Google) Code Review committed 2024-04-23 18:53:33 +00:00
commit f88bf7e23f
2 files changed
+21 -2

No files matched your search

@@ -141,9 +141,17 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<BaseActivity>
if (enableWidgetTapToAdd()) {
scrollToWidgetCell(wc);
if (mWidgetCellWithAddButton != null) {
// If there is a add button currently showing, hide it.
mWidgetCellWithAddButton.hideAddButton(/* animate= */ true);
if (mWidgetCellWithAddButton.isShowingAddButton()) {
// If there is a add button currently showing, hide it.
mWidgetCellWithAddButton.hideAddButton(/* animate= */ true);
} else {
// The last recorded widget cell to show an add button is no longer showing it,
// likely because the widget cell has been recycled or lost focus. If this is
// the cell that has been clicked, we will show it below.
mWidgetCellWithAddButton = null;
}
}
if (mWidgetCellWithAddButton != wc) {