Commit cf84a268 authored by Arturo Mejia's avatar Arturo Mejia
Browse files

Closes #4073 #4074: Adding an id to the tracking protection icon.

parent 91273056

components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt

+6 −3
Original line number Diff line number Diff line
@@ -614,9 +614,12 @@ internal class DisplayToolbar( 
        }

    }



    private fun shouldTrackingProtectionViewBeVisible() =

        displayTrackingProtectionIcon && (siteTrackingProtection == ON_NO_TRACKERS_BLOCKED ||

            siteTrackingProtection == ON_TRACKERS_BLOCKED)

    private fun shouldTrackingProtectionViewBeVisible(): Boolean {

        val visibleStates = arrayOf(ON_NO_TRACKERS_BLOCKED, ON_TRACKERS_BLOCKED, OFF_FOR_A_SITE)

        val isAVisibleSate = visibleStates.any { it == siteTrackingProtection }



        return displayTrackingProtectionIcon && isAVisibleSate

    }



    companion object {

        internal const val MEASURED_HEIGHT_THIRD_DENOMINATOR = 3

components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/display/DisplayToolbarTest.kt

+8 −0
Original line number Diff line number Diff line
@@ -195,6 +195,14 @@ class DisplayToolbarTest { 


        // Tracking protection views MUST be measured

        assertEquals(totalViewsWidth + trackingProtectionWidth + separatorWidth, view.measuredWidth)



        displayToolbar.setTrackingProtectionState(SiteTrackingProtection.OFF_FOR_A_SITE)

        displayToolbar.measure(widthSpec, heightSpec)



        totalViewsWidth = urlView.measuredWidth + securityIcon.measuredWidth



        // Tracking protection views MUST be measured

        assertEquals(totalViewsWidth + trackingProtectionWidth + separatorWidth, view.measuredWidth)

    }



    @Test