@@ -46,9 +46,11 @@ import androidx.compose.ui.node.LayoutModifierNode
4646import androidx.compose.ui.node.ModifierNodeElement
4747import androidx.compose.ui.node.requestRemeasure
4848import androidx.compose.ui.platform.AndroidComposeView
49+ import androidx.compose.ui.platform.ComposeView
4950import androidx.compose.ui.platform.InspectorInfo
5051import androidx.compose.ui.platform.LocalDensity
5152import androidx.compose.ui.platform.LocalView
53+ import androidx.compose.ui.platform.disableWindowInsetsRulers
5254import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
5355import androidx.compose.ui.unit.Constraints
5456import androidx.compose.ui.unit.IntRect
@@ -67,7 +69,7 @@ import com.google.common.truth.Truth.assertThat
6769import com.google.common.truth.Truth.assertWithMessage
6870import kotlin.math.roundToInt
6971import kotlinx.coroutines.test.StandardTestDispatcher
70- import org.junit.Assume
72+ import org.junit.After
7173import org.junit.Before
7274import org.junit.Rule
7375import org.junit.Test
@@ -93,6 +95,8 @@ class WindowInsetsRulersTest {
9395 private var contentWidth = 0
9496 private var contentHeight = 0
9597 private val displayCutoutRects = mutableObjectListOf<IntRect ?>()
98+ @Suppress(" DEPRECATION" )
99+ private var areWindowInsetsRulersEnabled = ComposeUiFlags .areWindowInsetsRulersEnabled
96100
97101 @Before
98102 fun setup () {
@@ -103,6 +107,12 @@ class WindowInsetsRulersTest {
103107 contentView.setOnApplyWindowInsetsListener { _, _ -> android.view.WindowInsets .CONSUMED }
104108 }
105109
110+ @After
111+ fun tearDown () {
112+ @Suppress(" DEPRECATION" )
113+ ComposeUiFlags .areWindowInsetsRulersEnabled = areWindowInsetsRulersEnabled
114+ }
115+
106116 private fun setContent (content : @Composable () -> Unit ) {
107117 rule.setContent {
108118 composeView = LocalView .current as AndroidComposeView
@@ -206,7 +216,6 @@ class WindowInsetsRulersTest {
206216
207217 @Test
208218 fun noRulers () {
209- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
210219 val rulerState = mutableStateOf(CaptionBar )
211220
212221 setSimpleRulerContent(rulerState)
@@ -234,7 +243,6 @@ class WindowInsetsRulersTest {
234243
235244 @Test
236245 fun onlyMaximumRulers () {
237- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
238246 val rulerState = mutableStateOf(CaptionBar )
239247
240248 setSimpleRulerContent(rulerState)
@@ -258,7 +266,6 @@ class WindowInsetsRulersTest {
258266
259267 @Test
260268 fun startAndStopProvidingRulers () {
261- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
262269 val rulerState = mutableStateOf(CaptionBar )
263270
264271 setSimpleRulerContent(rulerState)
@@ -283,7 +290,6 @@ class WindowInsetsRulersTest {
283290
284291 @Test
285292 fun normalRulers () {
286- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
287293 val rulerState = mutableStateOf(CaptionBar )
288294 setSimpleRulerContent(rulerState)
289295 val normalRulersList =
@@ -329,7 +335,6 @@ class WindowInsetsRulersTest {
329335
330336 @Test
331337 fun maximum () {
332- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
333338 val rulerState = mutableStateOf(CaptionBar )
334339 setSimpleRulerContent(rulerState)
335340 val maximumRulersList =
@@ -363,7 +368,6 @@ class WindowInsetsRulersTest {
363368
364369 @Test
365370 fun waterfallRulers () {
366- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
367371 val rulerState = mutableStateOf(Waterfall )
368372 setSimpleRulerContent(rulerState)
369373 rule.waitForIdle()
@@ -389,7 +393,6 @@ class WindowInsetsRulersTest {
389393 /* * Make sure that when the display cutout is set that it includes the rects for each side. */
390394 @Test
391395 fun displayCutoutRulers () {
392- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
393396 setSimpleRulerContent(mutableStateOf(DisplayCutout ))
394397
395398 val insets = createInsets(Type .displayCutout() to Insets .of(1 , 2 , 3 , 5 ))
@@ -409,7 +412,6 @@ class WindowInsetsRulersTest {
409412
410413 @Test
411414 fun mergedRulers () {
412- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
413415 val mergedRulersMap =
414416 mapOf (
415417 SafeGestures to
@@ -470,7 +472,6 @@ class WindowInsetsRulersTest {
470472
471473 @Test
472474 fun animatingRulers () {
473- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
474475 val rulerState = mutableStateOf(Ime )
475476 setSimpleRulerContent(rulerState)
476477
@@ -617,7 +618,6 @@ class WindowInsetsRulersTest {
617618
618619 @Test
619620 fun animateMergedRulers () {
620- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
621621 // display cutout and waterfall aren't animatable
622622 val mergedRulersMap =
623623 mapOf (
@@ -735,7 +735,6 @@ class WindowInsetsRulersTest {
735735
736736 @Test
737737 fun rulersInCenteredDialog () {
738- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
739738 var boxInsetsRect: IntRect ? = null
740739 var dialogInsetsRect: IntRect ? = null
741740 lateinit var coordinates: LayoutCoordinates
@@ -792,7 +791,6 @@ class WindowInsetsRulersTest {
792791
793792 @Test
794793 fun rulersInFullScreenDialog () {
795- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
796794 var boxInsetsRect: IntRect ? = null
797795 var dialogInsetsRect: IntRect ? = null
798796 lateinit var coordinates: LayoutCoordinates
@@ -925,7 +923,6 @@ class WindowInsetsRulersTest {
925923
926924 @Test
927925 fun innermostOf () {
928- Assume .assumeTrue(ComposeUiFlags .areWindowInsetsRulersEnabled)
929926 val rulerState = mutableStateOf(WindowInsetsRulers .innermostOf(CaptionBar , NavigationBars ))
930927 setSimpleRulerContent(rulerState)
931928 rule.waitForIdle()
@@ -975,6 +972,35 @@ class WindowInsetsRulersTest {
975972 }
976973 }
977974
975+ @Test
976+ fun disableWindowInsetsRulers () {
977+ ComposeView .disableWindowInsetsRulers()
978+ var left = 0f
979+ var top = 0f
980+ var right = 0f
981+ var bottom = 0f
982+ rule.setContent {
983+ Box (
984+ Modifier .fillMaxSize().layout { measurable, constraints ->
985+ val placeable = measurable.measure(constraints)
986+ layout(placeable.width, placeable.height) {
987+ placeable.place(0 , 0 )
988+ left = StatusBars .current.left.current(Float .NaN )
989+ top = StatusBars .current.top.current(Float .NaN )
990+ right = StatusBars .current.right.current(Float .NaN )
991+ bottom = StatusBars .current.bottom.current(Float .NaN )
992+ }
993+ }
994+ )
995+ }
996+ rule.waitForIdle()
997+
998+ assertThat(left).isNaN()
999+ assertThat(top).isNaN()
1000+ assertThat(right).isNaN()
1001+ assertThat(bottom).isNaN()
1002+ }
1003+
9781004 private fun createInsetsIgnoringVisibility (
9791005 vararg insetValues : Pair <Int , Insets >
9801006 ): WindowInsetsCompat {
0 commit comments