| commit | ab83443fe8d01a5778eacd634fc812663191bf79 | [log] [tgz] |
|---|---|---|
| author | Andy Wickham <awickham@google.com> | Wed Jan 25 20:54:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 20:54:52 2023 +0000 |
| tree | 866b0af2d92669fc1558bd6a122478460a682d15 | |
| parent | 49fcae002cf5748988269f43bce05efa1941faf0 [diff] | |
| parent | 8f7b86df536c29469b7e65572206760365b87cb6 [diff] |
Merge "Fix header padding when search not enabled." into tm-qpr-dev am: 62ef7ba819 am: 8f7b86df53 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074687 Change-Id: Ib49fa131add5b09a127c13b5e7915983c7cec9aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 */);