For #6625 Fix back navigation in search mode from browser
parent
bd475d54e5
commit
ef3c3de8a1
|
@ -226,20 +226,15 @@ class SearchFragment : Fragment(), BackHandler {
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
toolbarView.view.clearFocus()
|
toolbarView.view.clearFocus()
|
||||||
// clearing focus makes keyboard hidden after activity is resumed
|
|
||||||
awesomeBarView.isKeyboardDismissedProgrammatically = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBackPressed(): Boolean {
|
override fun onBackPressed(): Boolean {
|
||||||
return when {
|
return when {
|
||||||
qrFeature.onBackPressed() -> {
|
qrFeature.onBackPressed() -> {
|
||||||
view?.searchScanButton?.isChecked = false
|
view?.searchScanButton?.isChecked = false
|
||||||
// set to true because keyboard is being dismissed when returning from qr scan
|
|
||||||
awesomeBarView.isKeyboardDismissedProgrammatically = true
|
|
||||||
toolbarView.view.requestFocus()
|
toolbarView.view.requestFocus()
|
||||||
}
|
}
|
||||||
!awesomeBarView.isKeyboardDismissedProgrammatically -> true
|
else -> awesomeBarView.isKeyboardDismissedProgrammatically
|
||||||
else -> false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -188,7 +188,10 @@ class AwesomeBarView(
|
||||||
view.hideKeyboard()
|
view.hideKeyboard()
|
||||||
isKeyboardDismissedProgrammatically = true
|
isKeyboardDismissedProgrammatically = true
|
||||||
}
|
}
|
||||||
RecyclerView.SCROLL_STATE_IDLE -> isKeyboardDismissedProgrammatically = false
|
RecyclerView.SCROLL_STATE_IDLE -> {
|
||||||
|
isKeyboardDismissedProgrammatically = false
|
||||||
|
view.requestFocus()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue