blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8568 - Refocus URL editText in SearchFragment onResume

master
codrut.topliceanu 2020-02-20 14:58:32 +02:00 committed by Emily Kager
parent 3dcfed3761
commit ba39a46b88
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -27,6 +27,7 @@ import kotlinx.android.synthetic.main.search_suggestions_onboarding.view.*
import kotlinx.coroutines.ExperimentalCoroutinesApi
import mozilla.components.concept.storage.HistoryStorage
import mozilla.components.feature.qr.QrFeature
import mozilla.components.feature.qr.QrFragment
import mozilla.components.lib.state.ext.consumeFrom
import mozilla.components.support.base.feature.UserInteractionHandler
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@ -278,6 +279,31 @@ class SearchFragment : Fragment(), UserInteractionHandler {
permissionDidUpdate = false
hideToolbar()
if (!isQrFragmentVisible()) {
refocusUrlView()
}
}
/**
* Refocus URL editText. Needed after the user brings back the app
* into the foreground.
* See https://github.com/mozilla-mobile/fenix/issues/6290
**/
private fun refocusUrlView() {
val urlView = toolbarView.view
.findViewById<InlineAutocompleteEditText>(R.id.mozac_browser_toolbar_edit_url_view)
if (!urlView.hasFocus()) {
urlView.requestFocus()
}
}
/**
* Check to see if QrFragment exists & is visible.
* */
private fun isQrFragmentVisible(): Boolean {
val foundQrFragment = parentFragmentManager.fragments.firstOrNull { it is QrFragment }
return foundQrFragment != null && foundQrFragment.isVisible
}
override fun onPause() {