Fix keyboard animation when going back from emoji-search.

app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt

@@ -231,6 +231,7 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
   interface KeyboardStateListener {
     fun onKeyboardShown()
     fun onKeyboardHidden()
+    fun onKeyboardAnimationEnded() = Unit
   }
 
   interface WindowInsetsListener {
@@ -288,6 +289,10 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
     }
 
     override fun onEnd(animation: WindowInsetsAnimationCompat) {
+      keyboardStateListeners.forEach {
+        it.onKeyboardAnimationEnded()
+      }
+
       if (overridingKeyboard) {
         return
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt

@@ -4718,12 +4718,16 @@ class ConversationFragment :
     }
 
     override fun onKeyboardHidden() {
-      closeEmojiSearch()
-
       if (searchMenuItem?.isActionViewExpanded == true && searchMenuItem?.actionView?.hasFocus() == true) {
         searchMenuItem?.actionView?.clearFocus()
       }
     }
+
+    override fun onKeyboardAnimationEnded() {
+      if (!container.isKeyboardShowing) {
+        closeEmojiSearch()
+      }
+    }
   }
 
   //endregion