From e5a49f4b48c0ae1403ecdd793164cefe78c389c7 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 3 Oct 2022 14:47:07 -0700
Subject: [PATCH] Hide FloatingHeaderView while in Search state.

This prevents touches on the profile buttons (which were already
hidden due to the header view having alpha 0, but touches were
still registered).

Fix: 248338523
Test: Manually tap where the work profile button is before and
after this change. Before: switches to work profile. Afer: does
nothing in 0 state; otherwise launches item at that position.

Change-Id: Ie30661146d25740000d7a9cbe79234ac15347253
---
 src/com/android/launcher3/allapps/BaseAllAppsContainerView.java | 2 ++
 .../android/launcher3/allapps/SearchTransitionController.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
index f08254204e..c717310659 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
@@ -532,9 +532,11 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
         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());
diff --git a/src/com/android/launcher3/allapps/SearchTransitionController.java b/src/com/android/launcher3/allapps/SearchTransitionController.java
index a1f5bc696f..65a24ddd8a 100644
--- a/src/com/android/launcher3/allapps/SearchTransitionController.java
+++ b/src/com/android/launcher3/allapps/SearchTransitionController.java
@@ -124,6 +124,7 @@ public class SearchTransitionController {
         mSearchToAzAnimator.addListener(forSuccessCallback(onEndRunnable));
 
         mAllAppsContainerView.getFloatingHeaderView().setFloatingRowsCollapsed(true);
+        mAllAppsContainerView.getFloatingHeaderView().setVisibility(VISIBLE);
         mAllAppsContainerView.getAppsRecyclerViewContainer().setVisibility(VISIBLE);
         getSearchRecyclerView().setVisibility(VISIBLE);
         getSearchRecyclerView().setChildAttachedConsumer(this::onSearchChildAttached);