From 3e8265ec390a98699d3c0ea285b1ceffbc9b766e Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sat, 9 Oct 2021 13:49:06 +0700
Subject: [PATCH] Improve keyboard hiding animation

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

diff --git a/lawnchair/src/app/lawnchair/SearchBarInsetsHandler.kt b/lawnchair/src/app/lawnchair/SearchBarInsetsHandler.kt
index 300dbde9a1..12d926419d 100644
--- a/lawnchair/src/app/lawnchair/SearchBarInsetsHandler.kt
+++ b/lawnchair/src/app/lawnchair/SearchBarInsetsHandler.kt
@@ -38,7 +38,7 @@ class SearchBarInsetsHandler(private val shiftRange: Float) : WindowInsetsAnimat
         )
     }
 
-    fun onAnimationEnd(isSuccess: Boolean) {
-        animationController?.finish(!isSuccess)
+    fun onAnimationEnd() {
+        animationController?.finish(progress.value < 0.5f)
     }
 }
diff --git a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
index 59362e3106..155172ad53 100644
--- a/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
+++ b/lawnchair/src/app/lawnchair/SearchBarStateHandler.kt
@@ -42,8 +42,10 @@ class SearchBarStateHandler(private val launcher: LawnchairLauncher) : StateMana
             )
             animation.setFloat(handler.progress, AnimatedFloat.VALUE, 1f, Interpolators.LINEAR)
             animation.runOnEnd { isSuccess ->
-                handler.onAnimationEnd(isSuccess)
-                cancellationSignal.cancel()
+                if (isSuccess) {
+                    handler.onAnimationEnd()
+                    cancellationSignal.cancel()
+                }
             }
         }
         if (launcher.isInState(LauncherState.NORMAL) && toState == LauncherState.ALL_APPS) {