commit 2c5f545d0bae1324dc4d141eed59bc019f5af9a5
author Andy Wickham <awickham@google.com> Fri Oct 07 17:20:12 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 17:20:12 2022 +0000
tree 071571b75149ccf31f620fb90c80e010d0e12df5
parent 0c1dfbc1d8cf06568e8be658d7e5eda5da47dd78
parent e5a49f4b48c0ae1403ecdd793164cefe78c389c7

Merge "Hide FloatingHeaderView while in Search state." into tm-qpr-dev

src/com/android/launcher3/allapps/BaseAllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
index f082542..c717310 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
@@ -532,9 +532,11 @@
         if (isSearching()) {
             getSearchRecyclerView().setVisibility(VISIBLE);
             getAppsRecyclerViewContainer().setVisibility(GONE);
+            mHeader.setVisibility(GONE);
         } else {
             getSearchRecyclerView().setVisibility(GONE);
             getAppsRecyclerViewContainer().setVisibility(VISIBLE);
+            mHeader.setVisibility(VISIBLE);
         }
         if (mHeader.isSetUp()) {
             mHeader.setActiveRV(getCurrentPage());

src/com/android/launcher3/allapps/SearchTransitionController.java

diff --git a/src/com/android/launcher3/allapps/SearchTransitionController.java b/src/com/android/launcher3/allapps/SearchTransitionController.java
index a1f5bc6..65a24dd 100644
--- a/src/com/android/launcher3/allapps/SearchTransitionController.java
+++ b/src/com/android/launcher3/allapps/SearchTransitionController.java
@@ -124,6 +124,7 @@
         mSearchToAzAnimator.addListener(forSuccessCallback(onEndRunnable));
 
         mAllAppsContainerView.getFloatingHeaderView().setFloatingRowsCollapsed(true);
+        mAllAppsContainerView.getFloatingHeaderView().setVisibility(VISIBLE);
         mAllAppsContainerView.getAppsRecyclerViewContainer().setVisibility(VISIBLE);
         getSearchRecyclerView().setVisibility(VISIBLE);
         getSearchRecyclerView().setChildAttachedConsumer(this::onSearchChildAttached);