From ad753607d2316187622891b19b8180f6cfb7e12f Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Mon, 23 Jan 2023 10:49:15 -0800
Subject: [PATCH] Fix header padding when search not enabled.

This was specifically affecting taskbar all apps with
floating search bar enabled. Header placement should not
be changed in that case.

Fix: 266440950
Test: Manual in taskbar and other all apps surfaces with and
without work profile, floating search flag on and off.

Change-Id: I2296a079cc15387a517c61e6b8a21fa0081cba23
---
 .../launcher3/allapps/ActivityAllAppsContainerView.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index 2511cada78..11d93f0143 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -233,7 +233,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         super.setupHeader();
 
         removeCustomRules(mHeader);
-        if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
+        if (!isSearchSupported()) {
+            layoutWithoutSearchContainer(mHeader, false /* includeTabsMargin */);
+        } else if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
             alignParentTop(mHeader, false /* includeTabsMargin */);
         } else {
             layoutBelowSearchContainer(mHeader, false /* includeTabsMargin */);