Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e14bb5fb authored by archisha's avatar archisha
Browse files

Modifying ViewCaptureAwareWindowManager to add param to check if 

ViewCapture tracing is enabled.

Bug: 336521992
Flag: NONE Making library changes.
Test: Tested locally.
Change-Id: I64a1c58c09539485fcf9e19b187ea6a466a15bad
parent 50a66a22

viewcapturelib/src/com/android/app/viewcapture/ViewCaptureAwareWindowManager.kt

+13 −8
Original line number Diff line number Diff line
@@ -32,16 +32,19 @@ private const val TAG = "ViewCaptureWindowManager" 
class ViewCaptureAwareWindowManager(

    private val windowManager: WindowManager,

    private val lazyViewCapture: Lazy<ViewCapture>,

    private val isViewCaptureEnabled: Boolean,

) : WindowManager by windowManager {



    private var viewCaptureCloseableMap: MutableMap<View, SafeCloseable> = mutableMapOf()



    override fun addView(view: View, params: ViewGroup.LayoutParams?) {

        windowManager.addView(view, params)

        if (isViewCaptureEnabled) {

            val viewCaptureCloseable: SafeCloseable =

                lazyViewCapture.value.startCapture(view, getViewName(view))

            viewCaptureCloseableMap[view] = viewCaptureCloseable

        }

    }



    override fun removeView(view: View?) {

        removeViewFromCloseableMap(view)
@@ -56,6 +59,7 @@ class ViewCaptureAwareWindowManager( 
    private fun getViewName(view: View) = "." + view.javaClass.name



    private fun removeViewFromCloseableMap(view: View?) {

        if (isViewCaptureEnabled) {

            if (viewCaptureCloseableMap.containsKey(view)) {

                viewCaptureCloseableMap[view]?.close()

                viewCaptureCloseableMap.remove(view)
@@ -64,3 +68,4 @@ class ViewCaptureAwareWindowManager( 
            }

        }

    }

}

viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureAwareWindowManagerTest.kt

+19 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import org.mockito.ArgumentMatchers.any 
import org.mockito.ArgumentMatchers.anyString

import org.mockito.Mockito.doAnswer

import org.mockito.Mockito.spy

import org.mockito.Mockito.times

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.invocation.InvocationOnMock
@@ -56,14 +57,29 @@ class ViewCaptureAwareWindowManagerTest { 
            .`when`(windowManager)

            .addView(any(View::class.java), any(WindowManager.LayoutParams::class.java))

        `when`(mockRootView.context).thenReturn(context)

    }



    @Test

    fun testAddView_viewCaptureEnabled_verifyStartCaptureCall() {

        mViewCaptureAwareWindowManager =

            ViewCaptureAwareWindowManager(windowManager, lazyViewCapture)

            ViewCaptureAwareWindowManager(

                windowManager,

                lazyViewCapture,

                isViewCaptureEnabled = true

            )

        mViewCaptureAwareWindowManager?.addView(mockRootView, mockRootView.layoutParams)

        verify(viewCaptureSpy).startCapture(any(), anyString())

    }



    @Test

    fun testAddView_verifyStartCaptureCall() {

    fun testAddView_viewCaptureNotEnabled_verifyStartCaptureCall() {

        mViewCaptureAwareWindowManager =

            ViewCaptureAwareWindowManager(

                windowManager,

                lazyViewCapture,

                isViewCaptureEnabled = false

            )

        mViewCaptureAwareWindowManager?.addView(mockRootView, mockRootView.layoutParams)

        verify(viewCaptureSpy).startCapture(any(), anyString())

        verify(viewCaptureSpy, times(0)).startCapture(any(), anyString())

    }

}