Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d15bf44 authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge "Fixes issue where personal/work tabs could overlap search reasults."... 

Merge "Fixes issue where personal/work tabs could overlap search reasults." into tm-dev am: e44b0268

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18801671



Change-Id: Ia83993888377a932d855cf408dd2b7108133355a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de165adb e44b0268

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ public class FloatingHeaderView extends LinearLayout implements 
        int oldMaxHeight = mMaxTranslation;

        int oldMaxHeight = mMaxTranslation;

        updateExpectedHeight();

        updateExpectedHeight();





        if (mMaxTranslation != oldMaxHeight) {

        if (mMaxTranslation != oldMaxHeight || mCollapsed) {

            BaseAllAppsContainerView<?> parent = (BaseAllAppsContainerView<?>) getParent();

            BaseAllAppsContainerView<?> parent = (BaseAllAppsContainerView<?>) getParent();

            if (parent != null) {

            if (parent != null) {

                parent.setupHeader();

                parent.setupHeader();