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

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

@@ -535,7 +535,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         });
 
         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 */);