Revert "For #7032: Add scroll to dismiss keyboard in search fragment"
This reverts commit 536921bcea
.
master
parent
d66762910f
commit
9b16017d1d
|
@ -12,7 +12,6 @@ import android.graphics.Typeface.ITALIC
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.text.style.StyleSpan
|
import android.text.style.StyleSpan
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.MotionEvent
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.ViewStub
|
import android.view.ViewStub
|
||||||
|
@ -34,7 +33,6 @@ import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
|
||||||
import mozilla.components.support.ktx.android.content.getColorFromAttr
|
import mozilla.components.support.ktx.android.content.getColorFromAttr
|
||||||
import mozilla.components.support.ktx.android.content.hasCamera
|
import mozilla.components.support.ktx.android.content.hasCamera
|
||||||
import mozilla.components.support.ktx.android.content.isPermissionGranted
|
import mozilla.components.support.ktx.android.content.isPermissionGranted
|
||||||
import mozilla.components.support.ktx.android.view.hideKeyboard
|
|
||||||
import mozilla.components.ui.autocomplete.InlineAutocompleteEditText
|
import mozilla.components.ui.autocomplete.InlineAutocompleteEditText
|
||||||
import org.mozilla.fenix.BrowserDirection
|
import org.mozilla.fenix.BrowserDirection
|
||||||
import org.mozilla.fenix.HomeActivity
|
import org.mozilla.fenix.HomeActivity
|
||||||
|
@ -59,7 +57,6 @@ class SearchFragment : Fragment(), UserInteractionHandler {
|
||||||
private lateinit var searchStore: SearchFragmentStore
|
private lateinit var searchStore: SearchFragmentStore
|
||||||
private lateinit var searchInteractor: SearchInteractor
|
private lateinit var searchInteractor: SearchInteractor
|
||||||
|
|
||||||
@Suppress("LongMethod")
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
inflater: LayoutInflater,
|
inflater: LayoutInflater,
|
||||||
container: ViewGroup?,
|
container: ViewGroup?,
|
||||||
|
@ -122,14 +119,6 @@ class SearchFragment : Fragment(), UserInteractionHandler {
|
||||||
|
|
||||||
awesomeBarView = AwesomeBarView(view.scrollable_area, searchInteractor)
|
awesomeBarView = AwesomeBarView(view.scrollable_area, searchInteractor)
|
||||||
|
|
||||||
view.scrollView.setOnTouchListener { _, event ->
|
|
||||||
when (event?.action) {
|
|
||||||
MotionEvent.ACTION_SCROLL, MotionEvent.ACTION_MOVE -> {
|
|
||||||
view.hideKeyboard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
false
|
|
||||||
}
|
|
||||||
toolbarView = ToolbarView(
|
toolbarView = ToolbarView(
|
||||||
view.toolbar_component_wrapper,
|
view.toolbar_component_wrapper,
|
||||||
searchInteractor,
|
searchInteractor,
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
<androidx.core.widget.NestedScrollView
|
<androidx.core.widget.NestedScrollView
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:id="@+id/scrollView"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/search_divider"
|
app:layout_constraintBottom_toBottomOf="@id/search_divider"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|
Loading…
Reference in New Issue