Unverified Commit 51061347 authored by Mihai Adrian's avatar Mihai Adrian Committed by GitHub
Browse files

For #10408: Dismiss menu when navigating away. (#10415) 

The menu is dismissed when toolbar view is detached from window.
parent d2a3613b

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

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


package org.mozilla.fenix.components.toolbar



import android.view.View

import mozilla.components.browser.session.SelectionAwareSessionObserver

import mozilla.components.browser.session.Session

import mozilla.components.browser.session.SessionManager
@@ -14,10 +15,11 @@ class MenuPresenter( 
    private val menuToolbar: BrowserToolbar,

    sessionManager: SessionManager,

    private val sessionId: String? = null

) : SelectionAwareSessionObserver(sessionManager) {

) : SelectionAwareSessionObserver(sessionManager), View.OnAttachStateChangeListener {



    fun start() {

        observeIdOrSelected(sessionId)

        menuToolbar.addOnAttachStateChangeListener(this)

    }



    /** Redraw the refresh/stop button */
@@ -38,4 +40,12 @@ class MenuPresenter( 
    fun invalidateActions() {

        menuToolbar.invalidateActions()

    }



    override fun onViewDetachedFromWindow(v: View?) {

        menuToolbar.onStop()

    }



    override fun onViewAttachedToWindow(v: View?) {

        // no-op

    }

}