Commit e11f1b62 authored by mcarare's avatar mcarare Committed by Emily Kager
Browse files

For #10027: Make toolbar context menu popup dismissible on SDK<23

parent c4e83367

app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt

+7 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


package org.mozilla.fenix.components.toolbar



import android.graphics.Color

import android.graphics.drawable.ColorDrawable

import android.view.Gravity

import android.view.LayoutInflater

import android.view.View
@@ -51,7 +53,7 @@ interface BrowserToolbarViewInteractor { 
    fun onBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>)

    fun onScrolled(offset: Int)

}



@SuppressWarnings("LargeClass")

class BrowserToolbarView(

    private val container: ViewGroup,

    private val shouldUseBottomToolbar: Boolean,
@@ -98,6 +100,10 @@ class BrowserToolbarView( 
            popupWindow.elevation =

                view.context.resources.getDimension(R.dimen.mozac_browser_menu_elevation)



            // This is a workaround for SDK<23 to allow popup dismissal on outside or back button press

            // See: https://github.com/mozilla-mobile/fenix/issues/10027

            popupWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))



            customView.paste.isVisible = !clipboard.text.isNullOrEmpty() && !isCustomTabSession

            customView.paste_and_go.isVisible =

                !clipboard.text.isNullOrEmpty() && !isCustomTabSession