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

Commit a1c7d95b authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Fix testSearchDeadzoneForTablets failure" into tm-qpr-dev am: 026ddc44 

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



Change-Id: I3c98721e6304ecf9a4518a88a866fa22da03fce9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dee037f5 026ddc44

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

+1 −1
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public class AllAppsTransitionController 
                // Reset pull back progress and alpha after switching states.

                ALL_APPS_PULL_BACK_TRANSLATION.set(this, 0f);

                ALL_APPS_PULL_BACK_ALPHA.set(this, 1f);

                mLauncher.getAppsView().getSearchUiManager().getEditText().hideKeyboard();

            });

        }
@@ -239,7 +240,6 @@ public class AllAppsTransitionController 
        if (Float.compare(mProgress, targetProgress) == 0) {

            setAlphas(toState, config, builder);

            // Fail fast

            onProgressAnimationEnd();

            return;

        }