mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-23 12:38:33 +00:00
Fix SearchView loosing focus.
This commit is contained in:
@@ -194,6 +194,7 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
|
|||||||
protected fun resetKeyboardGuideline() {
|
protected fun resetKeyboardGuideline() {
|
||||||
clearKeyboardGuidelineOverride()
|
clearKeyboardGuidelineOverride()
|
||||||
keyboardGuideline?.setGuidelineEnd(navigationBarGuideline.guidelineEnd)
|
keyboardGuideline?.setGuidelineEnd(navigationBarGuideline.guidelineEnd)
|
||||||
|
keyboardAnimator.endingGuidelineEnd = navigationBarGuideline.guidelineEnd
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getKeyboardHeight(): Int {
|
private fun getKeyboardHeight(): Int {
|
||||||
|
|||||||
@@ -3275,7 +3275,7 @@ class ConversationFragment :
|
|||||||
multiselectItemDecoration.hideShade(binding.conversationItemRecycler)
|
multiselectItemDecoration.hideShade(binding.conversationItemRecycler)
|
||||||
ViewUtil.fadeOut(binding.reactionsShade, resources.getInteger(R.integer.reaction_scrubber_hide_duration), View.GONE)
|
ViewUtil.fadeOut(binding.reactionsShade, resources.getInteger(R.integer.reaction_scrubber_hide_duration), View.GONE)
|
||||||
|
|
||||||
if (focusedView == composeText) {
|
if (focusedView == composeText || searchMenuItem?.isActionViewExpanded == true) {
|
||||||
container.showSoftkey(composeText)
|
container.showSoftkey(composeText)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4349,7 +4349,11 @@ class ConversationFragment :
|
|||||||
isEnabled = false
|
isEnabled = false
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onKeyboardShown() = Unit
|
override fun onKeyboardShown() {
|
||||||
|
if (searchMenuItem?.isActionViewExpanded == true && searchMenuItem?.actionView?.hasFocus() == false) {
|
||||||
|
searchMenuItem?.actionView?.requestFocus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun onKeyboardHidden() {
|
override fun onKeyboardHidden() {
|
||||||
closeEmojiSearch()
|
closeEmojiSearch()
|
||||||
|
|||||||
Reference in New Issue
Block a user