For #2225 - Don't pass click events under find in page bar

nightly-build-test
Emily Kager 5 years ago committed by Emily Kager
parent 73de0cd2e8
commit 30ffc9fee2

@ -16,6 +16,7 @@ import mozilla.components.feature.toolbar.ToolbarFeature
import mozilla.components.feature.toolbar.ToolbarPresenter import mozilla.components.feature.toolbar.ToolbarPresenter
import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import mozilla.components.support.base.feature.LifecycleAwareFeature import mozilla.components.support.base.feature.LifecycleAwareFeature
import mozilla.components.support.ktx.android.view.hideKeyboard
import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.browser.BrowserFragmentDirections import org.mozilla.fenix.browser.BrowserFragmentDirections
@ -51,6 +52,7 @@ class ToolbarIntegration(
val tabsAction = TabCounterToolbarButton( val tabsAction = TabCounterToolbarButton(
sessionManager, sessionManager,
{ {
toolbar.hideKeyboard()
Navigation.findNavController(toolbar) Navigation.findNavController(toolbar)
.navigate(BrowserFragmentDirections.actionBrowserFragmentToHomeFragment()) .navigate(BrowserFragmentDirections.actionBrowserFragmentToHomeFragment())
}, },

@ -32,9 +32,10 @@
android:layout_height="56dp" android:layout_height="56dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="?foundation" android:background="?foundation"
mozac:findInPageResultCountTextColor="?primaryText" android:clickable="true"
mozac:findInPageButtonsTint="?primaryText"
android:visibility="gone" android:visibility="gone"
app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior" /> app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior"
mozac:findInPageButtonsTint="?primaryText"
mozac:findInPageResultCountTextColor="?primaryText" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading…
Cancel
Save