Turn off Window Insets Rulers
Bug: 410868572
Window InsetsRulers appears to be causing an issue in g3. Normally,
I would revert the CL, but other CLs are built on top of it, so it
is easier to just turn the flag off and debug later.
Test: ran broken test on g3
Change-Id: I33e9245ce2d4b3b8aed22b33a9fc6df467364958
diff --git a/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitInsideTest.kt b/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitInsideTest.kt
index a990e1b..c44f397 100644
--- a/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitInsideTest.kt
+++ b/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitInsideTest.kt
@@ -18,6 +18,8 @@
import android.view.View
import androidx.activity.ComponentActivity
import androidx.activity.enableEdgeToEdge
+import androidx.compose.ui.ComposeUiFlags
+import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.InsetsRulers.SystemBars
import androidx.compose.ui.layout.LayoutCoordinates
@@ -36,12 +38,14 @@
import androidx.test.filters.MediumTest
import androidx.test.filters.SdkSuppress
import com.google.common.truth.Truth.assertThat
+import org.junit.Assume
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+@OptIn(ExperimentalComposeUiApi::class)
@MediumTest
@SdkSuppress(minSdkVersion = 30)
@RunWith(JUnit4::class)
@@ -55,6 +59,7 @@
@Test
fun testFitWithin() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
@@ -77,6 +82,7 @@
@Test
fun testFitWithinNoBounds() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
diff --git a/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitOutsideTest.kt b/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitOutsideTest.kt
index 3d324a6..5c07932 100644
--- a/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitOutsideTest.kt
+++ b/compose/foundation/foundation-layout/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/layout/FitOutsideTest.kt
@@ -18,6 +18,8 @@
import android.view.View
import androidx.activity.ComponentActivity
import androidx.activity.enableEdgeToEdge
+import androidx.compose.ui.ComposeUiFlags
+import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.InsetsRulers.NavigationBars
import androidx.compose.ui.layout.InsetsRulers.StatusBars
@@ -39,12 +41,14 @@
import androidx.test.filters.MediumTest
import androidx.test.filters.SdkSuppress
import com.google.common.truth.Truth.assertThat
+import org.junit.Assume
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+@OptIn(ExperimentalComposeUiApi::class)
@MediumTest
@SdkSuppress(minSdkVersion = 30)
@RunWith(JUnit4::class)
@@ -58,6 +62,7 @@
@Test
fun testFitOutsideLeft() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
@@ -82,6 +87,7 @@
@Test
fun testFitOutsideTop() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
@@ -106,6 +112,7 @@
@Test
fun testFitOutsideRight() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
@@ -131,6 +138,7 @@
@Test
fun testFitOutsideBottom() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var outsideCoordinates: LayoutCoordinates
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
@@ -156,6 +164,7 @@
@Test
fun testFitOutsideNoInsets() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var insideCoordinates: LayoutCoordinates
lateinit var view: View
rule.setContent {
@@ -175,6 +184,7 @@
@Test
fun testFitOutsideNoBounds() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
lateinit var insideCoordinates: LayoutCoordinates
rule.setContent {
Box(Modifier.fillMaxSize()) {
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/layout/InsetsRulersTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/layout/InsetsRulersTest.kt
index 2cf1635..68f7b2a 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/layout/InsetsRulersTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/layout/InsetsRulersTest.kt
@@ -27,6 +27,8 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.ComposeUiFlags
+import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.InsetsRulers.CaptionBar
import androidx.compose.ui.layout.InsetsRulers.DisplayCutout
@@ -64,6 +66,7 @@
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage
import kotlin.math.roundToInt
+import org.junit.Assume
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -71,6 +74,7 @@
import org.junit.runners.Parameterized
import org.junit.runners.Parameterized.Parameters
+@OptIn(ExperimentalComposeUiApi::class)
@SdkSuppress(minSdkVersion = 30)
@RunWith(Parameterized::class)
class InsetsRulersTest(val useDelegatableNode: Boolean) {
@@ -227,6 +231,7 @@
@Test
fun normalRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
val rulerState = mutableStateOf<RectRulers>(CaptionBar)
setSimpleRulerContent(rulerState)
val normalRulersList =
@@ -270,6 +275,7 @@
@Test
fun ignoringVisibility() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
val rulerState = mutableStateOf<RectRulers>(CaptionBar)
setSimpleRulerContent(rulerState)
val ignoringVisibilityRulersList =
@@ -302,6 +308,7 @@
@Test
fun displayRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
val gestureRulerList =
listOf(
DisplayCutout,
@@ -339,6 +346,7 @@
/** Make sure that when the display cutout is set that it includes the rects for each side. */
@Test
fun displayCutoutRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
setSimpleRulerContent(mutableStateOf(DisplayCutout))
val insets = createInsets(Type.displayCutout() to Insets.of(1, 2, 3, 5))
@@ -358,6 +366,7 @@
@Test
fun mergedRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
val mergedRulersMap =
mapOf(
SafeGestures to
@@ -418,6 +427,7 @@
@Test
fun animatingRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
val rulerState = mutableStateOf<RectRulers>(Ime)
setSimpleRulerContent(rulerState)
@@ -580,6 +590,7 @@
@Test
fun animateMergedRulers() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
// display cutout and waterfall aren't animatable
val mergedRulersMap =
mapOf(
@@ -686,6 +697,7 @@
@Test
fun rulersInCenteredDialog() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
var boxInsetsRect: IntRect? = null
var dialogInsetsRect: IntRect? = null
lateinit var coordinates: LayoutCoordinates
@@ -742,6 +754,7 @@
@Test
fun rulersInFullScreenDialog() {
+ Assume.assumeTrue(ComposeUiFlags.areWindowInsetsRulersEnabled)
var boxInsetsRect: IntRect? = null
var dialogInsetsRect: IntRect? = null
lateinit var coordinates: LayoutCoordinates
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/ComposeUiFlags.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/ComposeUiFlags.kt
index 2a2b7b1..6c5d6cc 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/ComposeUiFlags.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/ComposeUiFlags.kt
@@ -105,7 +105,8 @@
* * `SafeGesturesRulers`
* * `SafeContentRulers`
*/
- @Suppress("MutableBareField") @JvmField var areWindowInsetsRulersEnabled = true
+ // off for b/410868572
+ @Suppress("MutableBareField") @JvmField var areWindowInsetsRulersEnabled = false
/**
* With this flag on, when an AccessibilityService performs ACTION_FOCUS on a Composable node,
