commit 1722e2f8551dde66744d9d3a2d0db611b96f24de
author Alina Zaidi <alinazaidi@google.com> Wed Apr 21 18:10:39 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 21 18:10:39 2021 +0000
tree d14b3ee233272e0263a1e0ece33cb26c49bb18be
parent a6e6689209ccd659dc8a3ca5d1845ba08ecac5ac
parent 80732f89e74419d7f812d1e356f800cf93e93eac

Merge "Fix some widget picker recommended widgets bugs." into sc-dev

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5be9a95..240958b 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -279,6 +279,7 @@
         super.onAttachedToWindow();
         mLauncher.getAppWidgetHost().addProviderChangeListener(this);
         notifyWidgetProvidersChanged();
+        onRecommendedWidgetsBound();
     }
 
     @Override
@@ -416,6 +417,7 @@
 
     @Override
     public void exitSearchMode() {
+        if (!mIsInSearchMode) return;
         onSearchResults(new ArrayList<>());
         setViewVisibilityBasedOnSearch(/*isInSearchMode=*/ false);
         if (mHasWorkProfile) {
@@ -464,7 +466,7 @@
                 mLauncher.getPopupDataProvider().getRecommendedWidgets();
         WidgetsRecommendationTableLayout table =
                 mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable;
-        if (recommendedWidgets.size() > 0) {
+        if (!mIsInSearchMode && recommendedWidgets.size() > 0) {
             // TODO(b/185508758): Revert the following log after debugging.
             if (getHeaderViewHeight() == 0) {
                 Log.d(TAG, "Header view height is 0 when inflating recommended widgets");