Merge remote-tracking branch 'origin/dev' into dev

2020-10-13 23:34:28 +09:00
parent 96108bc1ec 016f217db0
commit 861ae9be64
2 changed files with 3 additions and 3 deletions
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
@@ -57,7 +57,7 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
    var onFavoriteHistorySwitchClickListener: (() -> Unit)? = null

    init {
-        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+        searchInputView.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or searchInputView.imeOptions

        searchInputView.addTextChangedListener(this)
        onSearchListener = this
@@ -215,4 +215,4 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
            }
        }
    }
-}
+}