commit 62ef7ba8195029e9577beb17bd5df93aada8a9d5
author Andy Wickham <awickham@google.com> Wed Jan 25 19:10:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 25 19:10:09 2023 +0000
tree e83d41b858c11d94bee04a6290eeb56462e07d79
parent dbc5e56e074bcabc22465734b9eedb4e951e5653
parent ad753607d2316187622891b19b8180f6cfb7e12f

Merge "Fix header padding when search not enabled." into tm-qpr-dev

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

diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index 8a02a54..95e61b8 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -535,7 +535,9 @@
         });
 
         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 */);