From 1869a9868c3eada84c460dfa21e4a160e6d83b9c Mon Sep 17 00:00:00 2001
From: Alina Zaidi <alinazaidi@google.com>
Date: Mon, 19 Apr 2021 20:02:17 +0100
Subject: [PATCH] On exit search in widget picker, make recommended widgets
 table visible only if recommended widgets are available.

This fixes missing scroll bar on exit search issue (b/183616305)

Bug: 183616305
Test: Manually tested
Change-Id: I3ced5fb2f833f3d34b7dfd376bb4b7c231bc28f6
---
 .../android/launcher3/widget/picker/WidgetsFullSheet.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 5d9a2e2f88..006d20e044 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -434,8 +434,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet
 
     private void setViewVisibilityBasedOnSearch(boolean isInSearchMode) {
         mIsInSearchMode = isInSearchMode;
-        mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable
-                .setVisibility(isInSearchMode ? GONE : VISIBLE);
+        if (isInSearchMode) {
+            mSearchAndRecommendationViewHolder.mRecommendedWidgetsTable.setVisibility(GONE);
+        } else {
+            onRecommendedWidgetsBound();
+        }
         if (mHasWorkProfile) {
             mViewPager.setVisibility(isInSearchMode ? GONE : VISIBLE);
             mTabsView.setVisibility(isInSearchMode ? GONE : VISIBLE);