Commit 98092490 authored by MozLando's avatar MozLando
Browse files

Merge #5066 



5066: Add setDynamicToolbarMaxHeight API r=pocmo a=hiikezoe



Co-authored-by: default avatarHiroyuki Ikezoe <hiroyuki.ikezoe@gmail.com>
parents 4a3f8fd0 056ad9f7

components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineView.kt

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ class GeckoEngineView @JvmOverloads constructor( 
        currentGeckoView.setVerticalClipping(clippingHeight)

    }



    override fun setDynamicToolbarMaxHeight(height: Int) {

        // no-op

    }



    override fun captureThumbnail(onFinish: (Bitmap?) -> Unit) {

        val geckoResult = currentGeckoView.capturePixels()

        geckoResult.then({ bitmap ->

components/browser/engine-gecko-nightly/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineView.kt

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ class GeckoEngineView @JvmOverloads constructor( 
        currentGeckoView.setVerticalClipping(clippingHeight)

    }



    override fun setDynamicToolbarMaxHeight(height: Int) {

        currentGeckoView.setDynamicToolbarMaxHeight(height)

    }



    override fun captureThumbnail(onFinish: (Bitmap?) -> Unit) {

        val geckoResult = currentGeckoView.capturePixels()

        geckoResult.then({ bitmap ->

components/browser/engine-gecko-nightly/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineViewTest.kt

+10 −0
Original line number Diff line number Diff line
@@ -85,6 +85,16 @@ class GeckoEngineViewTest { 
        verify(engineView.currentGeckoView).setVerticalClipping(42)

    }



    @Test

    fun `setDynamicToolbarMaxHeight is forwarded to GeckoView instance`() {

        val engineView = GeckoEngineView(context)

        engineView.currentGeckoView = mock()



        engineView.setDynamicToolbarMaxHeight(42)



        verify(engineView.currentGeckoView).setDynamicToolbarMaxHeight(42)

    }



    @Test

    fun `release method releases session from GeckoView`() {

        val engineView = GeckoEngineView(context)

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineView.kt

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ class GeckoEngineView @JvmOverloads constructor( 
        currentGeckoView.setVerticalClipping(clippingHeight)

    }



    override fun setDynamicToolbarMaxHeight(height: Int) {

        // no-op

    }



    override fun captureThumbnail(onFinish: (Bitmap?) -> Unit) {

        val geckoResult = currentGeckoView.capturePixels()

        geckoResult.then({ bitmap ->

components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt

+4 −0
Original line number Diff line number Diff line
@@ -654,6 +654,10 @@ class SystemEngineView @JvmOverloads constructor( 
        // no-op

    }



    override fun setDynamicToolbarMaxHeight(height: Int) {

        // no-op

    }



    override fun canScrollVerticallyUp() = session?.webView?.canScrollVertically(-1) ?: false



    override fun canScrollVerticallyDown() = session?.webView?.canScrollVertically(1) ?: false