From cc96db523abb82e3b58d32112151f4ccb4a5d537 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sun, 10 Oct 2021 01:57:22 +0700
Subject: [PATCH] Fix keyboard showing when canceling swipe up

---
 lawnchair/src/app/lawnchair/SearchBarStateHandler.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
index 2e2285cbe9..ec1fd7531e 100644
--- a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
+++ b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
@@ -19,7 +19,7 @@ class SearchBarStateHandler(private val launcher: LawnchairLauncher) : StateMana
     private val autoShowKeyboard = PreferenceManager.getInstance(launcher).searchAutoShowKeyboard
 
     override fun setState(state: LauncherState) {
-        if (autoShowKeyboard.get()) {
+        if (state == LauncherState.ALL_APPS && autoShowKeyboard.get()) {
             showKeyboard()
         }
     }
@@ -50,8 +50,10 @@ class SearchBarStateHandler(private val launcher: LawnchairLauncher) : StateMana
         }
         if (launcher.isInState(LauncherState.NORMAL) && toState == LauncherState.ALL_APPS) {
             if (autoShowKeyboard.get()) {
+                val progress = AnimatedFloat()
+                animation.setFloat(progress, AnimatedFloat.VALUE, 1f, Interpolators.LINEAR)
                 animation.runOnEnd { isSuccess ->
-                    if (isSuccess) {
+                    if (isSuccess && progress.value > 0.5f) {
                         showKeyboard()
                     }
                 }