Merge "Remove paddings and insets from scaffold APIs" into androidx-main
diff --git a/compose/material3/adaptive/adaptive-layout/api/current.txt b/compose/material3/adaptive/adaptive-layout/api/current.txt
index 6d85541..c60dfc7 100644
--- a/compose/material3/adaptive/adaptive-layout/api/current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/current.txt
@@ -28,13 +28,11 @@
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class ListDetailPaneScaffoldDefaults {
method public androidx.compose.material3.adaptive.layout.ThreePaneScaffoldAdaptStrategies adaptStrategies(optional androidx.compose.material3.adaptive.layout.AdaptStrategy detailPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy listPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy extraPaneAdaptStrategy);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.layout.WindowInsets getWindowInsets();
- property @androidx.compose.runtime.Composable public final androidx.compose.foundation.layout.WindowInsets windowInsets;
field public static final androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldDefaults INSTANCE;
}
public final class ListDetailPaneScaffoldKt {
- method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void ListDetailPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> listPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> detailPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane, optional androidx.compose.foundation.layout.WindowInsets windowInsets);
+ method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void ListDetailPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> listPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> detailPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane);
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class ListDetailPaneScaffoldRole {
@@ -59,14 +57,12 @@
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Immutable public final class PaneScaffoldDirective {
- ctor public PaneScaffoldDirective(androidx.compose.foundation.layout.PaddingValues contentPadding, int maxHorizontalPartitions, float horizontalPartitionSpacerSize, int maxVerticalPartitions, float verticalPartitionSpacerSize, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
- method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ ctor public PaneScaffoldDirective(int maxHorizontalPartitions, float horizontalPartitionSpacerSize, int maxVerticalPartitions, float verticalPartitionSpacerSize, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
method public java.util.List<androidx.compose.ui.geometry.Rect> getExcludedBounds();
method public float getHorizontalPartitionSpacerSize();
method public int getMaxHorizontalPartitions();
method public int getMaxVerticalPartitions();
method public float getVerticalPartitionSpacerSize();
- property public final androidx.compose.foundation.layout.PaddingValues contentPadding;
property public final java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds;
property public final float horizontalPartitionSpacerSize;
property public final int maxHorizontalPartitions;
@@ -85,13 +81,11 @@
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class SupportingPaneScaffoldDefaults {
method public androidx.compose.material3.adaptive.layout.ThreePaneScaffoldAdaptStrategies adaptStrategies(optional androidx.compose.material3.adaptive.layout.AdaptStrategy mainPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy supportingPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy extraPaneAdaptStrategy);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.layout.WindowInsets getWindowInsets();
- property @androidx.compose.runtime.Composable public final androidx.compose.foundation.layout.WindowInsets windowInsets;
field public static final androidx.compose.material3.adaptive.layout.SupportingPaneScaffoldDefaults INSTANCE;
}
public final class SupportingPaneScaffoldKt {
- method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void SupportingPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> mainPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> supportingPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane, optional androidx.compose.foundation.layout.WindowInsets windowInsets);
+ method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void SupportingPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> mainPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> supportingPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane);
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class SupportingPaneScaffoldRole {
diff --git a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
index 6d85541..c60dfc7 100644
--- a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
@@ -28,13 +28,11 @@
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class ListDetailPaneScaffoldDefaults {
method public androidx.compose.material3.adaptive.layout.ThreePaneScaffoldAdaptStrategies adaptStrategies(optional androidx.compose.material3.adaptive.layout.AdaptStrategy detailPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy listPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy extraPaneAdaptStrategy);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.layout.WindowInsets getWindowInsets();
- property @androidx.compose.runtime.Composable public final androidx.compose.foundation.layout.WindowInsets windowInsets;
field public static final androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldDefaults INSTANCE;
}
public final class ListDetailPaneScaffoldKt {
- method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void ListDetailPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> listPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> detailPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane, optional androidx.compose.foundation.layout.WindowInsets windowInsets);
+ method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void ListDetailPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> listPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> detailPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane);
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class ListDetailPaneScaffoldRole {
@@ -59,14 +57,12 @@
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Immutable public final class PaneScaffoldDirective {
- ctor public PaneScaffoldDirective(androidx.compose.foundation.layout.PaddingValues contentPadding, int maxHorizontalPartitions, float horizontalPartitionSpacerSize, int maxVerticalPartitions, float verticalPartitionSpacerSize, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
- method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+ ctor public PaneScaffoldDirective(int maxHorizontalPartitions, float horizontalPartitionSpacerSize, int maxVerticalPartitions, float verticalPartitionSpacerSize, java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds);
method public java.util.List<androidx.compose.ui.geometry.Rect> getExcludedBounds();
method public float getHorizontalPartitionSpacerSize();
method public int getMaxHorizontalPartitions();
method public int getMaxVerticalPartitions();
method public float getVerticalPartitionSpacerSize();
- property public final androidx.compose.foundation.layout.PaddingValues contentPadding;
property public final java.util.List<androidx.compose.ui.geometry.Rect> excludedBounds;
property public final float horizontalPartitionSpacerSize;
property public final int maxHorizontalPartitions;
@@ -85,13 +81,11 @@
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class SupportingPaneScaffoldDefaults {
method public androidx.compose.material3.adaptive.layout.ThreePaneScaffoldAdaptStrategies adaptStrategies(optional androidx.compose.material3.adaptive.layout.AdaptStrategy mainPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy supportingPaneAdaptStrategy, optional androidx.compose.material3.adaptive.layout.AdaptStrategy extraPaneAdaptStrategy);
- method @androidx.compose.runtime.Composable public androidx.compose.foundation.layout.WindowInsets getWindowInsets();
- property @androidx.compose.runtime.Composable public final androidx.compose.foundation.layout.WindowInsets windowInsets;
field public static final androidx.compose.material3.adaptive.layout.SupportingPaneScaffoldDefaults INSTANCE;
}
public final class SupportingPaneScaffoldKt {
- method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void SupportingPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> mainPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> supportingPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane, optional androidx.compose.foundation.layout.WindowInsets windowInsets);
+ method @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Composable public static void SupportingPaneScaffold(androidx.compose.material3.adaptive.layout.PaneScaffoldDirective directive, androidx.compose.material3.adaptive.layout.ThreePaneScaffoldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> mainPane, kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit> supportingPane, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope,kotlin.Unit>? extraPane);
}
@SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi public final class SupportingPaneScaffoldRole {
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
index e22fcb5..c7be96d 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
@@ -19,7 +19,6 @@
import android.os.Build
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.MaterialTheme
@@ -132,48 +131,6 @@
}
@Test
- fun threePaneScaffold_insets_compact_size_window() {
- val mockInsets = WindowInsets(100.dp, 10.dp, 20.dp, 50.dp)
- rule.setContent {
- SampleThreePaneScaffoldWithInsets(mockInsets)
- }
-
- rule.onNodeWithTag(ThreePaneScaffoldTestTag)
- .captureToImage()
- .assertAgainstGolden(screenshotRule, "threePaneScaffold_insets_compact")
- }
-
- @Test
- fun threePaneScaffold_insets_medium_size_window() {
- val mockInsets = WindowInsets(100.dp, 10.dp, 20.dp, 50.dp)
- rule.setContentWithSimulatedSize(
- simulatedWidth = 700.dp,
- simulatedHeight = 500.dp
- ) {
- SampleThreePaneScaffoldWithInsets(mockInsets)
- }
-
- rule.onNodeWithTag(ThreePaneScaffoldTestTag)
- .captureToImage()
- .assertAgainstGolden(screenshotRule, "threePaneScaffold_insets_medium")
- }
-
- @Test
- fun threePaneScaffold_insets_expanded_size_window() {
- val mockInsets = WindowInsets(100.dp, 10.dp, 20.dp, 50.dp)
- rule.setContentWithSimulatedSize(
- simulatedWidth = 1024.dp,
- simulatedHeight = 800.dp
- ) {
- SampleThreePaneScaffoldWithInsets(mockInsets)
- }
-
- rule.onNodeWithTag(ThreePaneScaffoldTestTag)
- .captureToImage()
- .assertAgainstGolden(screenshotRule, "threePaneScaffold_insets_expanded")
- }
-
- @Test
fun threePaneScaffold_paneExpansion_fixedFirstPaneWidth() {
rule.setContentWithSimulatedSize(
simulatedWidth = 1024.dp,
@@ -454,27 +411,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
@Composable
-private fun SampleThreePaneScaffoldWithInsets(
- windowInsets: WindowInsets
-) {
- val scaffoldDirective = calculateStandardPaneScaffoldDirective(
- currentWindowAdaptiveInfo()
- )
- val scaffoldValue = calculateThreePaneScaffoldValue(
- scaffoldDirective.maxHorizontalPartitions,
- ThreePaneScaffoldDefaults.adaptStrategies(),
- null
- )
- SampleThreePaneScaffold(
- scaffoldDirective = scaffoldDirective,
- scaffoldValue = scaffoldValue,
- paneOrder = ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder,
- windowInsets = windowInsets
- )
-}
-
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
-@Composable
private fun SampleThreePaneScaffoldWithPaneExpansion(
paneExpansionState: PaneExpansionState,
paneExpansionDragHandle: (@Composable (PaneExpansionState) -> Unit)? = null,
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
index 47a4cd9..015fc59 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
@@ -16,12 +16,7 @@
package androidx.compose.material3.adaptive.layout
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.displayCutout
import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.union
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
@@ -174,7 +169,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
private val MockScaffoldDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(0.dp),
maxHorizontalPartitions = 1,
horizontalPartitionSpacerSize = 0.dp,
maxVerticalPartitions = 1,
@@ -202,7 +196,6 @@
paneOrder: ThreePaneScaffoldHorizontalOrder,
paneExpansionDragHandle: (@Composable (PaneExpansionState) -> Unit)? = null,
paneExpansionState: PaneExpansionState = PaneExpansionState(),
- windowInsets: WindowInsets = WindowInsets.systemBars.union(WindowInsets.displayCutout)
) {
ThreePaneScaffold(
modifier = Modifier.fillMaxSize().testTag(ThreePaneScaffoldTestTag),
@@ -211,7 +204,6 @@
paneOrder = paneOrder,
paneExpansionState = paneExpansionState,
paneExpansionDragHandle = paneExpansionDragHandle,
- windowInsets = windowInsets,
secondaryPane = {
AnimatedPane(
modifier = Modifier.testTag(tag = "SecondaryPane")
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt
index 2813adb..1d6be9b 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt
@@ -21,7 +21,6 @@
import androidx.compose.material3.adaptive.Posture
import androidx.compose.material3.adaptive.WindowAdaptiveInfo
import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.window.core.layout.WindowSizeClass
import com.google.common.truth.Truth.assertThat
@@ -43,15 +42,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(1)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(16.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(16.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(0.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(16.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(16.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -66,15 +57,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(1)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(0.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -89,15 +72,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(2)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -112,15 +87,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(1)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(2)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(0.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(24.dp)
}
@@ -135,15 +102,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(1)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(16.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(16.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(0.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(16.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(16.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -158,15 +117,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(2)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -181,15 +132,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(2)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(1)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(0.dp)
}
@@ -204,15 +147,7 @@
assertThat(scaffoldDirective.maxHorizontalPartitions).isEqualTo(2)
assertThat(scaffoldDirective.maxVerticalPartitions).isEqualTo(2)
- assertThat(
- scaffoldDirective.contentPadding.calculateLeftPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
- assertThat(
- scaffoldDirective.contentPadding.calculateRightPadding(LayoutDirection.Ltr)
- ).isEqualTo(24.dp)
assertThat(scaffoldDirective.horizontalPartitionSpacerSize).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateTopPadding()).isEqualTo(24.dp)
- assertThat(scaffoldDirective.contentPadding.calculateBottomPadding()).isEqualTo(24.dp)
assertThat(scaffoldDirective.verticalPartitionSpacerSize).isEqualTo(24.dp)
}
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
index aa58ec5..74f39ac 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
@@ -16,11 +16,7 @@
package androidx.compose.material3.adaptive.layout
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.displayCutout
import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.union
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -47,7 +43,6 @@
* @param extraPane the extra pane of the scaffold, which is supposed to hold any supplementary info
* besides the list and the detail panes, for example, a task list or a mini-calendar view of
* a mail app. See [ListDetailPaneScaffoldRole.Extra].
- * @param windowInsets window insets that the scaffold will respect.
*/
@ExperimentalMaterial3AdaptiveApi
@Composable
@@ -58,14 +53,12 @@
detailPane: @Composable ThreePaneScaffoldScope.() -> Unit,
modifier: Modifier = Modifier,
extraPane: (@Composable ThreePaneScaffoldScope.() -> Unit)? = null,
- windowInsets: WindowInsets = ListDetailPaneScaffoldDefaults.windowInsets,
) {
ThreePaneScaffold(
modifier = modifier.fillMaxSize(),
scaffoldDirective = directive,
scaffoldValue = value,
paneOrder = ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder,
- windowInsets = windowInsets,
secondaryPane = listPane,
tertiaryPane = extraPane,
primaryPane = detailPane
@@ -78,13 +71,6 @@
@ExperimentalMaterial3AdaptiveApi
object ListDetailPaneScaffoldDefaults {
/**
- * Default insets that will be used and consumed by [ListDetailPaneScaffold]. By default it will
- * be the union of [WindowInsets.Companion.systemBars] and
- * [WindowInsets.Companion.displayCutout].
- */
- val windowInsets @Composable get() = WindowInsets.systemBars.union(WindowInsets.displayCutout)
-
- /**
* Creates a default [ThreePaneScaffoldAdaptStrategies] for [ListDetailPaneScaffold].
*
* @param detailPaneAdaptStrategy the adapt strategy of the primary pane
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
index 18bc602..c4977e1 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirective.kt
@@ -16,7 +16,6 @@
package androidx.compose.material3.adaptive.layout
-import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.Posture
import androidx.compose.material3.adaptive.WindowAdaptiveInfo
@@ -51,22 +50,18 @@
verticalHingePolicy: HingePolicy = HingePolicy.AvoidSeparating
): PaneScaffoldDirective {
val maxHorizontalPartitions: Int
- val contentPadding: PaddingValues
val verticalSpacerSize: Dp
when (windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass) {
WindowWidthSizeClass.COMPACT -> {
maxHorizontalPartitions = 1
- contentPadding = PaddingValues(16.dp)
verticalSpacerSize = 0.dp
}
WindowWidthSizeClass.MEDIUM -> {
maxHorizontalPartitions = 1
- contentPadding = PaddingValues(24.dp)
verticalSpacerSize = 0.dp
}
else -> {
maxHorizontalPartitions = 2
- contentPadding = PaddingValues(24.dp)
verticalSpacerSize = 24.dp
}
}
@@ -83,7 +78,6 @@
}
return PaneScaffoldDirective(
- contentPadding,
maxHorizontalPartitions,
verticalSpacerSize,
maxVerticalPartitions,
@@ -113,22 +107,18 @@
verticalHingePolicy: HingePolicy = HingePolicy.AvoidSeparating
): PaneScaffoldDirective {
val maxHorizontalPartitions: Int
- val contentPadding: PaddingValues
val verticalSpacerSize: Dp
when (windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass) {
WindowWidthSizeClass.COMPACT -> {
maxHorizontalPartitions = 1
- contentPadding = PaddingValues(16.dp)
verticalSpacerSize = 0.dp
}
WindowWidthSizeClass.MEDIUM -> {
maxHorizontalPartitions = 2
- contentPadding = PaddingValues(24.dp)
verticalSpacerSize = 24.dp
}
else -> {
maxHorizontalPartitions = 2
- contentPadding = PaddingValues(24.dp)
verticalSpacerSize = 24.dp
}
}
@@ -144,7 +134,6 @@
}
return PaneScaffoldDirective(
- contentPadding,
maxHorizontalPartitions,
verticalSpacerSize,
maxVerticalPartitions,
@@ -168,7 +157,6 @@
* partitions the layout can be split into and what should be the gutter size.
*
* @constructor create an instance of [PaneScaffoldDirective]
- * @param contentPadding Size of the paddings between the panes and the outer bounds of the layout.
* @param maxHorizontalPartitions the max number of partitions along the horizontal axis the layout
* can be split into.
* @param horizontalPartitionSpacerSize Size of the spacers between horizontal partitions.
@@ -183,7 +171,6 @@
@ExperimentalMaterial3AdaptiveApi
@Immutable
class PaneScaffoldDirective(
- val contentPadding: PaddingValues,
val maxHorizontalPartitions: Int,
val horizontalPartitionSpacerSize: Dp,
val maxVerticalPartitions: Int,
@@ -193,7 +180,6 @@
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is PaneScaffoldDirective) return false
- if (contentPadding != other.contentPadding) return false
if (maxHorizontalPartitions != other.maxHorizontalPartitions) return false
if (horizontalPartitionSpacerSize != other.horizontalPartitionSpacerSize) return false
if (maxVerticalPartitions != other.maxVerticalPartitions) return false
@@ -202,8 +188,7 @@
}
override fun hashCode(): Int {
- var result = contentPadding.hashCode()
- result = 31 * result + maxHorizontalPartitions
+ var result = maxHorizontalPartitions
result = 31 * result + horizontalPartitionSpacerSize.hashCode()
result = 31 * result + maxVerticalPartitions
result = 31 * result + verticalPartitionSpacerSize.hashCode()
@@ -211,8 +196,7 @@
}
override fun toString(): String {
- return "PaneScaffoldDirective(contentPadding=$contentPadding, " +
- "maxHorizontalPartitions=$maxHorizontalPartitions, " +
+ return "PaneScaffoldDirective(maxHorizontalPartitions=$maxHorizontalPartitions, " +
"horizontalPartitionSpacerSize=$horizontalPartitionSpacerSize, " +
"maxVerticalPartitions=$maxVerticalPartitions, " +
"verticalPartitionSpacerSize=$verticalPartitionSpacerSize, " +
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
index a70ea4e..8c62ee1 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
@@ -16,11 +16,7 @@
package androidx.compose.material3.adaptive.layout
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.displayCutout
import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.foundation.layout.union
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -41,7 +37,6 @@
* @param extraPane the extra pane of the scaffold, which is supposed to hold any additional content
* besides the main and the supporting panes, for example, a styling panel in a doc app.
* See [SupportingPaneScaffoldRole.Extra].
- * @param windowInsets window insets that the scaffold will respect.
*/
@ExperimentalMaterial3AdaptiveApi
@Composable
@@ -52,14 +47,12 @@
supportingPane: @Composable ThreePaneScaffoldScope.() -> Unit,
modifier: Modifier = Modifier,
extraPane: (@Composable ThreePaneScaffoldScope.() -> Unit)? = null,
- windowInsets: WindowInsets = SupportingPaneScaffoldDefaults.windowInsets,
) {
ThreePaneScaffold(
modifier = modifier.fillMaxSize(),
scaffoldDirective = directive,
scaffoldValue = value,
paneOrder = ThreePaneScaffoldDefaults.SupportingPaneLayoutPaneOrder,
- windowInsets = windowInsets,
secondaryPane = supportingPane,
tertiaryPane = extraPane,
primaryPane = mainPane
@@ -72,13 +65,6 @@
@ExperimentalMaterial3AdaptiveApi
object SupportingPaneScaffoldDefaults {
/**
- * Default insets that will be used and consumed by [SupportingPaneScaffold]. By default it will
- * be the union of [WindowInsets.Companion.systemBars] and
- * [WindowInsets.Companion.displayCutout].
- */
- val windowInsets @Composable get() = WindowInsets.systemBars.union(WindowInsets.displayCutout)
-
- /**
* Creates a default [ThreePaneScaffoldAdaptStrategies] for [SupportingPaneScaffold].
*
* @param mainPaneAdaptStrategy the adapt strategy of the main pane
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
index b7d2264c..0540d83 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
@@ -25,7 +25,6 @@
import androidx.compose.animation.core.Transition
import androidx.compose.animation.core.rememberTransition
import androidx.compose.animation.core.snap
-import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -90,7 +89,6 @@
scaffoldDirective: PaneScaffoldDirective,
scaffoldValue: ThreePaneScaffoldValue,
paneOrder: ThreePaneScaffoldHorizontalOrder,
- windowInsets: WindowInsets,
secondaryPane: @Composable ThreePaneScaffoldScope.() -> Unit,
tertiaryPane: (@Composable ThreePaneScaffoldScope.() -> Unit)? = null,
paneExpansionState: PaneExpansionState = PaneExpansionState(),
@@ -108,7 +106,6 @@
scaffoldDirective = scaffoldDirective,
scaffoldState = scaffoldState,
paneOrder = paneOrder,
- windowInsets = windowInsets,
secondaryPane = secondaryPane,
tertiaryPane = tertiaryPane,
paneExpansionState = paneExpansionState,
@@ -124,7 +121,6 @@
scaffoldDirective: PaneScaffoldDirective,
scaffoldState: SeekableTransitionState<ThreePaneScaffoldValue>,
paneOrder: ThreePaneScaffoldHorizontalOrder,
- windowInsets: WindowInsets,
secondaryPane: @Composable ThreePaneScaffoldScope.() -> Unit,
tertiaryPane: (@Composable ThreePaneScaffoldScope.() -> Unit)? = null,
paneExpansionState: PaneExpansionState = PaneExpansionState(),
@@ -239,13 +235,11 @@
scaffoldState.targetState,
paneExpansionState,
ltrPaneOrder,
- windowInsets
)
}.apply {
this.scaffoldDirective = scaffoldDirective
this.scaffoldValue = scaffoldState.targetState
this.paneOrder = ltrPaneOrder
- this.windowInsets = windowInsets
}
Layout(
@@ -265,12 +259,10 @@
scaffoldValue: ThreePaneScaffoldValue,
val paneExpansionState: PaneExpansionState,
paneOrder: ThreePaneScaffoldHorizontalOrder,
- windowInsets: WindowInsets
) : MultiContentMeasurePolicy {
var scaffoldDirective by mutableStateOf(scaffoldDirective)
var scaffoldValue by mutableStateOf(scaffoldValue)
var paneOrder by mutableStateOf(paneOrder)
- var windowInsets by mutableStateOf(windowInsets)
/**
* Data class that is used to store the position and width of an expanded pane to be reused when
@@ -317,32 +309,16 @@
}
val verticalSpacerSize = scaffoldDirective.horizontalPartitionSpacerSize.roundToPx()
- val leftContentPadding = max(
- scaffoldDirective.contentPadding.calculateLeftPadding(layoutDirection).roundToPx(),
- windowInsets.getLeft(this@measure, layoutDirection)
- )
- val rightContentPadding = max(
- scaffoldDirective.contentPadding.calculateRightPadding(layoutDirection).roundToPx(),
- windowInsets.getRight(this@measure, layoutDirection)
- )
- val topContentPadding = max(
- scaffoldDirective.contentPadding.calculateTopPadding().roundToPx(),
- windowInsets.getTop(this@measure)
- )
- val bottomContentPadding = max(
- scaffoldDirective.contentPadding.calculateBottomPadding().roundToPx(),
- windowInsets.getBottom(this@measure)
- )
val outerBounds = IntRect(
- leftContentPadding,
- topContentPadding,
- constraints.maxWidth - rightContentPadding,
- constraints.maxHeight - bottomContentPadding
+ 0,
+ 0,
+ constraints.maxWidth,
+ constraints.maxHeight
)
if (!paneExpansionState.isUnspecified()) {
// Pane expansion should override everything
- val availableWidth = constraints.maxWidth - leftContentPadding - rightContentPadding
+ val availableWidth = constraints.maxWidth
if (paneExpansionState.firstPaneWidth == 0 ||
paneExpansionState.firstPanePercentage == 0f) {
if (visiblePanes.size > 1) {
@@ -388,10 +364,10 @@
} else if (scaffoldDirective.excludedBounds.isNotEmpty()) {
val layoutBounds = coordinates!!.boundsInWindow()
val layoutPhysicalPartitions = mutableListOf<Rect>()
- var actualLeft = layoutBounds.left + leftContentPadding
- var actualRight = layoutBounds.right - rightContentPadding
- val actualTop = layoutBounds.top + topContentPadding
- val actualBottom = layoutBounds.bottom - bottomContentPadding
+ var actualLeft = layoutBounds.left
+ var actualRight = layoutBounds.right
+ val actualTop = layoutBounds.top
+ val actualBottom = layoutBounds.bottom
// Assume hinge bounds are sorted from left to right, non-overlapped.
@Suppress("ListIterator")
scaffoldDirective.excludedBounds.forEach { hingeBound ->
diff --git a/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/ListDetailPaneScaffoldNavigatorTest.kt b/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/ListDetailPaneScaffoldNavigatorTest.kt
index 358be71..d665d36 100644
--- a/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/ListDetailPaneScaffoldNavigatorTest.kt
+++ b/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/ListDetailPaneScaffoldNavigatorTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.material3.adaptive.navigation
-import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
@@ -569,7 +568,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
private val MockSinglePaneScaffoldDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(0.dp),
maxHorizontalPartitions = 1,
horizontalPartitionSpacerSize = 0.dp,
maxVerticalPartitions = 1,
@@ -579,7 +577,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
private val MockDualPaneScaffoldDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(16.dp),
maxHorizontalPartitions = 2,
horizontalPartitionSpacerSize = 16.dp,
maxVerticalPartitions = 1,
diff --git a/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/SupportingPaneScaffoldNavigatorTest.kt b/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/SupportingPaneScaffoldNavigatorTest.kt
index 5092174..e73f542 100644
--- a/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/SupportingPaneScaffoldNavigatorTest.kt
+++ b/compose/material3/adaptive/adaptive-navigation/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/navigation/SupportingPaneScaffoldNavigatorTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.material3.adaptive.navigation
-import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
import androidx.compose.material3.adaptive.layout.PaneScaffoldDirective
@@ -583,7 +582,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
private val MockSinglePaneScaffoldDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(0.dp),
maxHorizontalPartitions = 1,
horizontalPartitionSpacerSize = 0.dp,
maxVerticalPartitions = 1,
@@ -593,7 +591,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
private val MockDualPaneScaffoldDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(16.dp),
maxHorizontalPartitions = 2,
horizontalPartitionSpacerSize = 16.dp,
maxVerticalPartitions = 1,
diff --git a/compose/material3/adaptive/benchmark/src/androidTest/java/androidx/compose/material3/adaptive/benchmark/TestUtils.kt b/compose/material3/adaptive/benchmark/src/androidTest/java/androidx/compose/material3/adaptive/benchmark/TestUtils.kt
index acfcf48..302c605 100644
--- a/compose/material3/adaptive/benchmark/src/androidTest/java/androidx/compose/material3/adaptive/benchmark/TestUtils.kt
+++ b/compose/material3/adaptive/benchmark/src/androidTest/java/androidx/compose/material3/adaptive/benchmark/TestUtils.kt
@@ -18,7 +18,6 @@
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.layout.AnimatedPane
@@ -37,7 +36,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
val singlePaneDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(16.dp),
maxHorizontalPartitions = 1,
horizontalPartitionSpacerSize = 0.dp,
maxVerticalPartitions = 1,
@@ -47,7 +45,6 @@
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
val dualPaneDirective = PaneScaffoldDirective(
- contentPadding = PaddingValues(24.dp),
maxHorizontalPartitions = 2,
horizontalPartitionSpacerSize = 24.dp,
maxVerticalPartitions = 1,
