[Exp Policy] Graduate ExperimentalFoundationApi APIs introduced prior to 1.7
Change-Id: I184e0feec13c7311e4829fdbb3519774c061ad4a
diff --git a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithAnimateItemPlacement.kt b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithAnimateItemPlacement.kt
index ef0f78a..f2a5efc9 100644
--- a/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithAnimateItemPlacement.kt
+++ b/compose/animation/animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/lookahead/LookaheadWithAnimateItemPlacement.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.demos.layoutanimation.turquoiseColors
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -38,7 +37,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay
-@OptIn(ExperimentalFoundationApi::class)
@Preview
@Composable
fun LookaheadWithAnimateItem() {
diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index c7fc05d..98e3cad 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -35,7 +35,7 @@
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier basicMarquee(androidx.compose.ui.Modifier, optional int iterations, optional int animationMode, optional int repeatDelayMillis, optional int initialDelayMillis, optional androidx.compose.foundation.MarqueeSpacing spacing, optional float velocity);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class BasicTooltipDefaults {
+ public final class BasicTooltipDefaults {
method public androidx.compose.foundation.MutatorMutex getGlobalMutatorMutex();
property public final androidx.compose.foundation.MutatorMutex GlobalMutatorMutex;
field public static final androidx.compose.foundation.BasicTooltipDefaults INSTANCE;
@@ -43,11 +43,11 @@
}
public final class BasicTooltipKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public static androidx.compose.foundation.BasicTooltipState BasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static androidx.compose.foundation.BasicTooltipState rememberBasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BasicTooltipState BasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.BasicTooltipState rememberBasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface BasicTooltipState {
+ @androidx.compose.runtime.Stable public interface BasicTooltipState {
method public void dismiss();
method public boolean isPersistent();
method public boolean isVisible();
@@ -58,7 +58,7 @@
}
public final class BasicTooltip_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void BasicTooltipBox(androidx.compose.ui.window.PopupPositionProvider positionProvider, kotlin.jvm.functions.Function0<kotlin.Unit> tooltip, androidx.compose.foundation.BasicTooltipState state, optional androidx.compose.ui.Modifier modifier, optional boolean focusable, optional boolean enableUserInput, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void BasicTooltipBox(androidx.compose.ui.window.PopupPositionProvider positionProvider, kotlin.jvm.functions.Function0<kotlin.Unit> tooltip, androidx.compose.foundation.BasicTooltipState state, optional androidx.compose.ui.Modifier modifier, optional boolean focusable, optional boolean enableUserInput, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
public final class BorderKt {
@@ -90,18 +90,18 @@
}
public final class ClickableKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.foundation.CombinedClickableNode CombinedClickableNode(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
+ method public static androidx.compose.foundation.CombinedClickableNode CombinedClickableNode(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
}
public final class ClipScrollableContainerKt {
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface CombinedClickableNode extends androidx.compose.ui.node.PointerInputModifierNode {
+ public sealed interface CombinedClickableNode extends androidx.compose.ui.node.PointerInputModifierNode {
method public void update(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
}
@@ -123,7 +123,7 @@
}
public final class FocusedBoundsKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier onFocusedBoundsChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates?,kotlin.Unit> onPositioned);
+ method public static androidx.compose.ui.Modifier onFocusedBoundsChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates?,kotlin.Unit> onPositioned);
}
public final class HoverableKt {
@@ -209,7 +209,7 @@
method public inline boolean tryMutate(kotlin.jvm.functions.Function0<kotlin.Unit> block);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public final class OverscrollConfiguration {
+ @androidx.compose.runtime.Stable public final class OverscrollConfiguration {
ctor public OverscrollConfiguration(optional long glowColor, optional androidx.compose.foundation.layout.PaddingValues drawPadding);
method public androidx.compose.foundation.layout.PaddingValues getDrawPadding();
method public long getGlowColor();
@@ -218,11 +218,11 @@
}
public final class OverscrollConfiguration_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> getLocalOverscrollConfiguration();
- property @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> LocalOverscrollConfiguration;
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> getLocalOverscrollConfiguration();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> LocalOverscrollConfiguration;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface OverscrollEffect {
+ @androidx.compose.runtime.Stable public interface OverscrollEffect {
method public suspend Object? applyToFling(long velocity, kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.Velocity,? super kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>,? extends java.lang.Object?> performFling, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public long applyToScroll(long delta, int source, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,androidx.compose.ui.geometry.Offset> performScroll);
method public androidx.compose.ui.Modifier getEffectModifier();
@@ -232,7 +232,7 @@
}
public final class OverscrollKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier overscroll(androidx.compose.ui.Modifier, androidx.compose.foundation.OverscrollEffect overscrollEffect);
+ method public static androidx.compose.ui.Modifier overscroll(androidx.compose.ui.Modifier, androidx.compose.foundation.OverscrollEffect overscrollEffect);
}
public final class PreferKeepClear_androidKt {
@@ -296,7 +296,7 @@
package androidx.compose.foundation.content {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class MediaType {
+ public final class MediaType {
ctor public MediaType(String representation);
method public String getRepresentation();
property public final String representation;
@@ -369,19 +369,19 @@
package androidx.compose.foundation.draganddrop {
public final class AndroidDragAndDropSource_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
+ method public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
}
public final class DragAndDropSourceKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawDragDecoration, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
+ method public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawDragDecoration, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface DragAndDropSourceScope extends androidx.compose.ui.input.pointer.PointerInputScope {
+ public interface DragAndDropSourceScope extends androidx.compose.ui.input.pointer.PointerInputScope {
method public void startTransfer(androidx.compose.ui.draganddrop.DragAndDropTransferData transferData);
}
public final class DragAndDropTargetKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropTarget(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draganddrop.DragAndDropEvent,java.lang.Boolean> shouldStartDragAndDrop, androidx.compose.ui.draganddrop.DragAndDropTarget target);
+ method public static androidx.compose.ui.Modifier dragAndDropTarget(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draganddrop.DragAndDropEvent,java.lang.Boolean> shouldStartDragAndDrop, androidx.compose.ui.draganddrop.DragAndDropTarget target);
}
}
@@ -404,12 +404,12 @@
}
public final class AnchoredDraggableKt {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, androidx.compose.foundation.gestures.DraggableAnchors<T> anchors, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.DraggableAnchors<T> DraggableAnchors(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.gestures.DraggableAnchorsConfig<T>,kotlin.Unit> builder);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
+ method @Deprecated public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, androidx.compose.foundation.gestures.DraggableAnchors<T> anchors, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method @Deprecated public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method public static <T> androidx.compose.foundation.gestures.DraggableAnchors<T> DraggableAnchors(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.gestures.DraggableAnchorsConfig<T>,kotlin.Unit> builder);
+ method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
+ method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static suspend <T> Object? animateTo(androidx.compose.foundation.gestures.AnchoredDraggableState<T>, T targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public static suspend <T> Object? animateToWithDecay(androidx.compose.foundation.gestures.AnchoredDraggableState<T>, T targetValue, float velocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.coroutines.Continuation<? super java.lang.Float>);
@@ -453,11 +453,11 @@
}
public static final class AnchoredDraggableState.Companion {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method @Deprecated public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface BringIntoViewSpec {
+ @androidx.compose.runtime.Stable public interface BringIntoViewSpec {
method public default float calculateScrollDistance(float offset, float size, float containerSize);
method @Deprecated public default androidx.compose.animation.core.AnimationSpec<java.lang.Float> getScrollAnimationSpec();
property @Deprecated public default androidx.compose.animation.core.AnimationSpec<java.lang.Float> scrollAnimationSpec;
@@ -508,7 +508,7 @@
method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.Drag2DScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface DraggableAnchors<T> {
+ public interface DraggableAnchors<T> {
method public T? closestAnchor(float position);
method public T? closestAnchor(float position, boolean searchUpwards);
method public void forEach(kotlin.jvm.functions.Function2<? super T,? super java.lang.Float,kotlin.Unit> block);
@@ -520,7 +520,7 @@
property public abstract int size;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class DraggableAnchorsConfig<T> {
+ public final class DraggableAnchorsConfig<T> {
ctor public DraggableAnchorsConfig();
method public infix void at(T, float position);
}
@@ -570,15 +570,14 @@
}
public final class ScrollableDefaults {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.foundation.gestures.BringIntoViewSpec bringIntoViewSpec();
method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public androidx.compose.foundation.OverscrollEffect overscrollEffect();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.OverscrollEffect overscrollEffect();
method public boolean reverseDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.foundation.gestures.Orientation orientation, boolean reverseScrolling);
field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
}
public final class ScrollableKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.gestures.BringIntoViewSpec? bringIntoViewSpec);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.gestures.BringIntoViewSpec? bringIntoViewSpec);
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
}
@@ -630,7 +629,7 @@
public final class TransformableKt {
method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,java.lang.Boolean> canPan, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+ method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,java.lang.Boolean> canPan, optional boolean lockRotationOnZoomPan, optional boolean enabled);
}
@kotlin.jvm.JvmDefaultWithCompatibility public interface TransformableState {
@@ -666,11 +665,6 @@
method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.FlingBehavior rememberSnapFlingBehavior(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.foundation.gestures.snapping.SnapPosition snapPosition);
}
- @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class SnapFlingBehavior implements androidx.compose.foundation.gestures.TargetedFlingBehavior {
- ctor @Deprecated public SnapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec);
- method @Deprecated public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onRemainingDistanceUpdated, kotlin.coroutines.Continuation<? super java.lang.Float>);
- }
-
public final class SnapFlingBehaviorKt {
method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TargetedFlingBehavior rememberSnapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider);
method public static androidx.compose.foundation.gestures.TargetedFlingBehavior snapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec);
@@ -824,7 +818,6 @@
@androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyItemScope {
method public default androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
@@ -887,7 +880,7 @@
method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
method public default void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Object?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ method public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
}
@androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
@@ -994,7 +987,6 @@
@androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
method public androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
}
@androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridItemSpanScope {
@@ -1096,7 +1088,7 @@
package androidx.compose.foundation.lazy.layout {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface IntervalList<T> {
+ public sealed interface IntervalList<T> {
method public void forEach(optional int fromIndex, optional int toIndex, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.layout.IntervalList.Interval<? extends T>,kotlin.Unit> block);
method public operator androidx.compose.foundation.lazy.layout.IntervalList.Interval<T> get(int index);
method public int getSize();
@@ -1112,7 +1104,7 @@
property public final T value;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public abstract class LazyLayoutIntervalContent<Interval extends androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent.Interval> {
+ public abstract class LazyLayoutIntervalContent<Interval extends androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent.Interval> {
ctor public LazyLayoutIntervalContent();
method public final Object? getContentType(int index);
method public abstract androidx.compose.foundation.lazy.layout.IntervalList<Interval> getIntervals();
@@ -1123,14 +1115,14 @@
property public final int itemCount;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static interface LazyLayoutIntervalContent.Interval {
+ public static interface LazyLayoutIntervalContent.Interval {
method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? getKey();
method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object?> getType();
property public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? key;
property public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object?> type;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface LazyLayoutItemProvider {
+ @androidx.compose.runtime.Stable public interface LazyLayoutItemProvider {
method @androidx.compose.runtime.Composable public void Item(int index, Object key);
method public default Object? getContentType(int index);
method public default int getIndex(Object key);
@@ -1140,11 +1132,10 @@
}
public final class LazyLayoutKt {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayout(androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider itemProvider, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState? prefetchState, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayout(kotlin.jvm.functions.Function0<? extends androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider> itemProvider, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState? prefetchState, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public sealed interface LazyLayoutMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ @androidx.compose.runtime.Stable public sealed interface LazyLayoutMeasureScope extends androidx.compose.ui.layout.MeasureScope {
method public java.util.List<androidx.compose.ui.layout.Placeable> measure(int index, long constraints);
method @androidx.compose.runtime.Stable public default float toDp(float);
method @androidx.compose.runtime.Stable public default float toDp(int);
@@ -1157,14 +1148,14 @@
}
public final class LazyLayoutPinnableItemKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayoutPinnableItem(Object? key, int index, androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList pinnedItemList, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyLayoutPinnableItem(Object? key, int index, androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList pinnedItemList, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class LazyLayoutPinnedItemList implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList.PinnedItem> {
+ public final class LazyLayoutPinnedItemList implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList.PinnedItem> {
ctor public LazyLayoutPinnedItemList();
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static sealed interface LazyLayoutPinnedItemList.PinnedItem {
+ public static sealed interface LazyLayoutPinnedItemList.PinnedItem {
method public int getIndex();
method public Object? getKey();
property public abstract int index;
@@ -1183,10 +1174,10 @@
}
public final class Lazy_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static Object getDefaultLazyLayoutKey(int index);
+ method public static Object getDefaultLazyLayoutKey(int index);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class MutableIntervalList<T> implements androidx.compose.foundation.lazy.layout.IntervalList<T> {
+ public final class MutableIntervalList<T> implements androidx.compose.foundation.lazy.layout.IntervalList<T> {
ctor public MutableIntervalList();
method public void addInterval(int size, T value);
method public void forEach(int fromIndex, int toIndex, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.layout.IntervalList.Interval<? extends T>,kotlin.Unit> block);
@@ -1200,15 +1191,15 @@
method public void schedulePrefetch(int index, long constraints);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface PrefetchRequest {
+ public sealed interface PrefetchRequest {
method public boolean execute(androidx.compose.foundation.lazy.layout.PrefetchRequestScope);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface PrefetchRequestScope {
+ public interface PrefetchRequestScope {
method public long availableTimeNanos();
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface PrefetchScheduler {
+ public interface PrefetchScheduler {
method public void schedulePrefetch(androidx.compose.foundation.lazy.layout.PrefetchRequest prefetchRequest);
}
@@ -1242,7 +1233,6 @@
@androidx.compose.runtime.Stable public sealed interface LazyStaggeredGridItemScope {
method public androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
}
public sealed interface LazyStaggeredGridLayoutInfo {
@@ -1432,8 +1422,8 @@
method public final void requestScrollToPage(@IntRange(from=0L) int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public final suspend Object? scrollToPage(int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final void updateCurrentPage(androidx.compose.foundation.gestures.ScrollScope, int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final void updateTargetPage(androidx.compose.foundation.gestures.ScrollScope, int targetPage);
+ method public final void updateCurrentPage(androidx.compose.foundation.gestures.ScrollScope, int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
+ method public final void updateTargetPage(androidx.compose.foundation.gestures.ScrollScope, int targetPage);
property public final boolean canScrollBackward;
property public final boolean canScrollForward;
property public final int currentPage;
@@ -1457,19 +1447,19 @@
package androidx.compose.foundation.relocation {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface BringIntoViewRequester {
+ public sealed interface BringIntoViewRequester {
method public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
public final class BringIntoViewRequesterKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.foundation.relocation.BringIntoViewRequester BringIntoViewRequester();
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewRequester(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewRequester bringIntoViewRequester);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
+ method public static androidx.compose.foundation.relocation.BringIntoViewRequester BringIntoViewRequester();
+ method public static androidx.compose.ui.Modifier bringIntoViewRequester(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewRequester bringIntoViewRequester);
+ method public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface BringIntoViewResponder {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public suspend Object? bringChildIntoView(kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Rect?> localRect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.geometry.Rect calculateRectForParent(androidx.compose.ui.geometry.Rect localRect);
+ public interface BringIntoViewResponder {
+ method public suspend Object? bringChildIntoView(kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Rect?> localRect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.geometry.Rect calculateRectForParent(androidx.compose.ui.geometry.Rect localRect);
}
}
@@ -1623,7 +1613,6 @@
public final class ClickableTextKt {
method @Deprecated @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, kotlin.jvm.functions.Function1<? super java.lang.Integer?,kotlin.Unit> onHover, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
@androidx.compose.runtime.Immutable public final class InlineTextContent {
@@ -1775,7 +1764,7 @@
property public final long selection;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static interface TextFieldBuffer.ChangeList {
+ public static interface TextFieldBuffer.ChangeList {
method public int getChangeCount();
method public long getOriginalRange(int changeIndex);
method public long getRange(int changeIndex);
@@ -1857,7 +1846,7 @@
property public final int Visible;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class UndoState {
+ public final class UndoState {
method public void clearHistory();
method public boolean getCanRedo();
method public boolean getCanUndo();
diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index 88f35f2..d4cb479 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -35,7 +35,7 @@
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier basicMarquee(androidx.compose.ui.Modifier, optional int iterations, optional int animationMode, optional int repeatDelayMillis, optional int initialDelayMillis, optional androidx.compose.foundation.MarqueeSpacing spacing, optional float velocity);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class BasicTooltipDefaults {
+ public final class BasicTooltipDefaults {
method public androidx.compose.foundation.MutatorMutex getGlobalMutatorMutex();
property public final androidx.compose.foundation.MutatorMutex GlobalMutatorMutex;
field public static final androidx.compose.foundation.BasicTooltipDefaults INSTANCE;
@@ -43,11 +43,11 @@
}
public final class BasicTooltipKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public static androidx.compose.foundation.BasicTooltipState BasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static androidx.compose.foundation.BasicTooltipState rememberBasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
+ method @androidx.compose.runtime.Stable public static androidx.compose.foundation.BasicTooltipState BasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
+ method @androidx.compose.runtime.Composable public static androidx.compose.foundation.BasicTooltipState rememberBasicTooltipState(optional boolean initialIsVisible, optional boolean isPersistent, optional androidx.compose.foundation.MutatorMutex mutatorMutex);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface BasicTooltipState {
+ @androidx.compose.runtime.Stable public interface BasicTooltipState {
method public void dismiss();
method public boolean isPersistent();
method public boolean isVisible();
@@ -58,7 +58,7 @@
}
public final class BasicTooltip_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void BasicTooltipBox(androidx.compose.ui.window.PopupPositionProvider positionProvider, kotlin.jvm.functions.Function0<kotlin.Unit> tooltip, androidx.compose.foundation.BasicTooltipState state, optional androidx.compose.ui.Modifier modifier, optional boolean focusable, optional boolean enableUserInput, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void BasicTooltipBox(androidx.compose.ui.window.PopupPositionProvider positionProvider, kotlin.jvm.functions.Function0<kotlin.Unit> tooltip, androidx.compose.foundation.BasicTooltipState state, optional androidx.compose.ui.Modifier modifier, optional boolean focusable, optional boolean enableUserInput, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
public final class BorderKt {
@@ -90,18 +90,18 @@
}
public final class ClickableKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.foundation.CombinedClickableNode CombinedClickableNode(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
+ method public static androidx.compose.foundation.CombinedClickableNode CombinedClickableNode(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
method public static androidx.compose.ui.Modifier clickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.Indication? indication, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
+ method public static androidx.compose.ui.Modifier combinedClickable(androidx.compose.ui.Modifier, optional boolean enabled, optional String? onClickLabel, optional androidx.compose.ui.semantics.Role? role, optional String? onLongClickLabel, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, kotlin.jvm.functions.Function0<kotlin.Unit> onClick);
}
public final class ClipScrollableContainerKt {
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier clipScrollableContainer(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.Orientation orientation);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface CombinedClickableNode extends androidx.compose.ui.node.PointerInputModifierNode {
+ public sealed interface CombinedClickableNode extends androidx.compose.ui.node.PointerInputModifierNode {
method public void update(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, String? onLongClickLabel, kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function0<kotlin.Unit>? onDoubleClick, androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, androidx.compose.foundation.IndicationNodeFactory? indicationNodeFactory, boolean enabled, String? onClickLabel, androidx.compose.ui.semantics.Role? role);
}
@@ -123,7 +123,7 @@
}
public final class FocusedBoundsKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier onFocusedBoundsChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates?,kotlin.Unit> onPositioned);
+ method public static androidx.compose.ui.Modifier onFocusedBoundsChanged(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.layout.LayoutCoordinates?,kotlin.Unit> onPositioned);
}
public final class HoverableKt {
@@ -211,7 +211,7 @@
method @kotlin.PublishedApi internal void unlock();
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public final class OverscrollConfiguration {
+ @androidx.compose.runtime.Stable public final class OverscrollConfiguration {
ctor public OverscrollConfiguration(optional long glowColor, optional androidx.compose.foundation.layout.PaddingValues drawPadding);
method public androidx.compose.foundation.layout.PaddingValues getDrawPadding();
method public long getGlowColor();
@@ -220,11 +220,11 @@
}
public final class OverscrollConfiguration_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> getLocalOverscrollConfiguration();
- property @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> LocalOverscrollConfiguration;
+ method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> getLocalOverscrollConfiguration();
+ property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.foundation.OverscrollConfiguration?> LocalOverscrollConfiguration;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface OverscrollEffect {
+ @androidx.compose.runtime.Stable public interface OverscrollEffect {
method public suspend Object? applyToFling(long velocity, kotlin.jvm.functions.Function2<? super androidx.compose.ui.unit.Velocity,? super kotlin.coroutines.Continuation<? super androidx.compose.ui.unit.Velocity>,? extends java.lang.Object?> performFling, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public long applyToScroll(long delta, int source, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,androidx.compose.ui.geometry.Offset> performScroll);
method public androidx.compose.ui.Modifier getEffectModifier();
@@ -234,7 +234,7 @@
}
public final class OverscrollKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier overscroll(androidx.compose.ui.Modifier, androidx.compose.foundation.OverscrollEffect overscrollEffect);
+ method public static androidx.compose.ui.Modifier overscroll(androidx.compose.ui.Modifier, androidx.compose.foundation.OverscrollEffect overscrollEffect);
}
public final class PreferKeepClear_androidKt {
@@ -298,7 +298,7 @@
package androidx.compose.foundation.content {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class MediaType {
+ public final class MediaType {
ctor public MediaType(String representation);
method public String getRepresentation();
property public final String representation;
@@ -371,19 +371,19 @@
package androidx.compose.foundation.draganddrop {
public final class AndroidDragAndDropSource_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
+ method public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
}
public final class DragAndDropSourceKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawDragDecoration, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
+ method public static androidx.compose.ui.Modifier dragAndDropSource(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.graphics.drawscope.DrawScope,kotlin.Unit> drawDragDecoration, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.draganddrop.DragAndDropSourceScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface DragAndDropSourceScope extends androidx.compose.ui.input.pointer.PointerInputScope {
+ public interface DragAndDropSourceScope extends androidx.compose.ui.input.pointer.PointerInputScope {
method public void startTransfer(androidx.compose.ui.draganddrop.DragAndDropTransferData transferData);
}
public final class DragAndDropTargetKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier dragAndDropTarget(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draganddrop.DragAndDropEvent,java.lang.Boolean> shouldStartDragAndDrop, androidx.compose.ui.draganddrop.DragAndDropTarget target);
+ method public static androidx.compose.ui.Modifier dragAndDropTarget(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.draganddrop.DragAndDropEvent,java.lang.Boolean> shouldStartDragAndDrop, androidx.compose.ui.draganddrop.DragAndDropTarget target);
}
}
@@ -406,12 +406,12 @@
}
public final class AnchoredDraggableKt {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, androidx.compose.foundation.gestures.DraggableAnchors<T> anchors, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.foundation.gestures.DraggableAnchors<T> DraggableAnchors(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.gestures.DraggableAnchorsConfig<T>,kotlin.Unit> builder);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
+ method @Deprecated public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, androidx.compose.foundation.gestures.DraggableAnchors<T> anchors, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method @Deprecated public static <T> androidx.compose.foundation.gestures.AnchoredDraggableState<T> AnchoredDraggableState(T initialValue, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method public static <T> androidx.compose.foundation.gestures.DraggableAnchors<T> DraggableAnchors(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.gestures.DraggableAnchorsConfig<T>,kotlin.Unit> builder);
+ method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
+ method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static <T> androidx.compose.ui.Modifier anchoredDraggable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.AnchoredDraggableState<T> state, boolean reverseDirection, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional boolean startDragImmediately, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior);
method public static suspend <T> Object? animateTo(androidx.compose.foundation.gestures.AnchoredDraggableState<T>, T targetValue, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public static suspend <T> Object? animateToWithDecay(androidx.compose.foundation.gestures.AnchoredDraggableState<T>, T targetValue, float velocity, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.coroutines.Continuation<? super java.lang.Float>);
@@ -455,11 +455,11 @@
}
public static final class AnchoredDraggableState.Companion {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
+ method @Deprecated public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Float> positionalThreshold, kotlin.jvm.functions.Function0<java.lang.Float> velocityThreshold, optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
method public <T> androidx.compose.runtime.saveable.Saver<androidx.compose.foundation.gestures.AnchoredDraggableState<T>,T> Saver(optional kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> confirmValueChange);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface BringIntoViewSpec {
+ @androidx.compose.runtime.Stable public interface BringIntoViewSpec {
method public default float calculateScrollDistance(float offset, float size, float containerSize);
method @Deprecated public default androidx.compose.animation.core.AnimationSpec<java.lang.Float> getScrollAnimationSpec();
property @Deprecated public default androidx.compose.animation.core.AnimationSpec<java.lang.Float> scrollAnimationSpec;
@@ -510,7 +510,7 @@
method public suspend Object? drag(optional androidx.compose.foundation.MutatePriority dragPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.Drag2DScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface DraggableAnchors<T> {
+ public interface DraggableAnchors<T> {
method public T? closestAnchor(float position);
method public T? closestAnchor(float position, boolean searchUpwards);
method public void forEach(kotlin.jvm.functions.Function2<? super T,? super java.lang.Float,kotlin.Unit> block);
@@ -522,7 +522,7 @@
property public abstract int size;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class DraggableAnchorsConfig<T> {
+ public final class DraggableAnchorsConfig<T> {
ctor public DraggableAnchorsConfig();
method public infix void at(T, float position);
}
@@ -572,15 +572,14 @@
}
public final class ScrollableDefaults {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.foundation.gestures.BringIntoViewSpec bringIntoViewSpec();
method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.FlingBehavior flingBehavior();
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public androidx.compose.foundation.OverscrollEffect overscrollEffect();
+ method @androidx.compose.runtime.Composable public androidx.compose.foundation.OverscrollEffect overscrollEffect();
method public boolean reverseDirection(androidx.compose.ui.unit.LayoutDirection layoutDirection, androidx.compose.foundation.gestures.Orientation orientation, boolean reverseScrolling);
field public static final androidx.compose.foundation.gestures.ScrollableDefaults INSTANCE;
}
public final class ScrollableKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.gestures.BringIntoViewSpec? bringIntoViewSpec);
+ method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.compose.foundation.OverscrollEffect? overscrollEffect, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource, optional androidx.compose.foundation.gestures.BringIntoViewSpec? bringIntoViewSpec);
method @androidx.compose.runtime.Stable public static androidx.compose.ui.Modifier scrollable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, optional boolean enabled, optional boolean reverseDirection, optional androidx.compose.foundation.gestures.FlingBehavior? flingBehavior, optional androidx.compose.foundation.interaction.MutableInteractionSource? interactionSource);
}
@@ -632,7 +631,7 @@
public final class TransformableKt {
method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, optional boolean lockRotationOnZoomPan, optional boolean enabled);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,java.lang.Boolean> canPan, optional boolean lockRotationOnZoomPan, optional boolean enabled);
+ method public static androidx.compose.ui.Modifier transformable(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.TransformableState state, kotlin.jvm.functions.Function1<? super androidx.compose.ui.geometry.Offset,java.lang.Boolean> canPan, optional boolean lockRotationOnZoomPan, optional boolean enabled);
}
@kotlin.jvm.JvmDefaultWithCompatibility public interface TransformableState {
@@ -668,11 +667,6 @@
method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.FlingBehavior rememberSnapFlingBehavior(androidx.compose.foundation.lazy.LazyListState lazyListState, optional androidx.compose.foundation.gestures.snapping.SnapPosition snapPosition);
}
- @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class SnapFlingBehavior implements androidx.compose.foundation.gestures.TargetedFlingBehavior {
- ctor @Deprecated public SnapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec);
- method @Deprecated public suspend Object? performFling(androidx.compose.foundation.gestures.ScrollScope, float initialVelocity, kotlin.jvm.functions.Function1<? super java.lang.Float,kotlin.Unit> onRemainingDistanceUpdated, kotlin.coroutines.Continuation<? super java.lang.Float>);
- }
-
public final class SnapFlingBehaviorKt {
method @androidx.compose.runtime.Composable public static androidx.compose.foundation.gestures.TargetedFlingBehavior rememberSnapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider);
method public static androidx.compose.foundation.gestures.TargetedFlingBehavior snapFlingBehavior(androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider snapLayoutInfoProvider, androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec);
@@ -826,7 +820,6 @@
@androidx.compose.foundation.lazy.LazyScopeMarker @androidx.compose.runtime.Stable @kotlin.jvm.JvmDefaultWithCompatibility public interface LazyItemScope {
method public default androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
method public androidx.compose.ui.Modifier fillParentMaxHeight(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
method public androidx.compose.ui.Modifier fillParentMaxSize(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
method public androidx.compose.ui.Modifier fillParentMaxWidth(androidx.compose.ui.Modifier, optional @FloatRange(from=0.0, to=1.0) float fraction);
@@ -889,7 +882,7 @@
method @Deprecated public void item(optional Object? key, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
method public default void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Object?> contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
method @Deprecated public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
+ method public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.LazyItemScope,kotlin.Unit> content);
}
@androidx.compose.runtime.Stable public final class LazyListState implements androidx.compose.foundation.gestures.ScrollableState {
@@ -996,7 +989,6 @@
@androidx.compose.foundation.lazy.grid.LazyGridScopeMarker @androidx.compose.runtime.Stable public sealed interface LazyGridItemScope {
method public androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
}
@androidx.compose.foundation.lazy.grid.LazyGridScopeMarker public sealed interface LazyGridItemSpanScope {
@@ -1098,7 +1090,7 @@
package androidx.compose.foundation.lazy.layout {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface IntervalList<T> {
+ public sealed interface IntervalList<T> {
method public void forEach(optional int fromIndex, optional int toIndex, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.layout.IntervalList.Interval<? extends T>,kotlin.Unit> block);
method public operator androidx.compose.foundation.lazy.layout.IntervalList.Interval<T> get(int index);
method public int getSize();
@@ -1114,7 +1106,7 @@
property public final T value;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public abstract class LazyLayoutIntervalContent<Interval extends androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent.Interval> {
+ public abstract class LazyLayoutIntervalContent<Interval extends androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent.Interval> {
ctor public LazyLayoutIntervalContent();
method public final Object? getContentType(int index);
method public abstract androidx.compose.foundation.lazy.layout.IntervalList<Interval> getIntervals();
@@ -1125,14 +1117,14 @@
property public final int itemCount;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static interface LazyLayoutIntervalContent.Interval {
+ public static interface LazyLayoutIntervalContent.Interval {
method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? getKey();
method public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object?> getType();
property public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object>? key;
property public default kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object?> type;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public interface LazyLayoutItemProvider {
+ @androidx.compose.runtime.Stable public interface LazyLayoutItemProvider {
method @androidx.compose.runtime.Composable public void Item(int index, Object key);
method public default Object? getContentType(int index);
method public default int getIndex(Object key);
@@ -1142,11 +1134,10 @@
}
public final class LazyLayoutKt {
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayout(androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider itemProvider, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState? prefetchState, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayout(kotlin.jvm.functions.Function0<? extends androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider> itemProvider, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.lazy.layout.LazyLayoutPrefetchState? prefetchState, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope,? super androidx.compose.ui.unit.Constraints,? extends androidx.compose.ui.layout.MeasureResult> measurePolicy);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Stable public sealed interface LazyLayoutMeasureScope extends androidx.compose.ui.layout.MeasureScope {
+ @androidx.compose.runtime.Stable public sealed interface LazyLayoutMeasureScope extends androidx.compose.ui.layout.MeasureScope {
method public java.util.List<androidx.compose.ui.layout.Placeable> measure(int index, long constraints);
method @androidx.compose.runtime.Stable public default float toDp(float);
method @androidx.compose.runtime.Stable public default float toDp(int);
@@ -1159,14 +1150,14 @@
}
public final class LazyLayoutPinnableItemKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void LazyLayoutPinnableItem(Object? key, int index, androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList pinnedItemList, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+ method @androidx.compose.runtime.Composable public static void LazyLayoutPinnableItem(Object? key, int index, androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList pinnedItemList, kotlin.jvm.functions.Function0<kotlin.Unit> content);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class LazyLayoutPinnedItemList implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList.PinnedItem> {
+ public final class LazyLayoutPinnedItemList implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.foundation.lazy.layout.LazyLayoutPinnedItemList.PinnedItem> {
ctor public LazyLayoutPinnedItemList();
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static sealed interface LazyLayoutPinnedItemList.PinnedItem {
+ public static sealed interface LazyLayoutPinnedItemList.PinnedItem {
method public int getIndex();
method public Object? getKey();
property public abstract int index;
@@ -1185,10 +1176,10 @@
}
public final class Lazy_androidKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static Object getDefaultLazyLayoutKey(int index);
+ method public static Object getDefaultLazyLayoutKey(int index);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class MutableIntervalList<T> implements androidx.compose.foundation.lazy.layout.IntervalList<T> {
+ public final class MutableIntervalList<T> implements androidx.compose.foundation.lazy.layout.IntervalList<T> {
ctor public MutableIntervalList();
method public void addInterval(int size, T value);
method public void forEach(int fromIndex, int toIndex, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.lazy.layout.IntervalList.Interval<? extends T>,kotlin.Unit> block);
@@ -1202,15 +1193,15 @@
method public void schedulePrefetch(int index, long constraints);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface PrefetchRequest {
+ public sealed interface PrefetchRequest {
method public boolean execute(androidx.compose.foundation.lazy.layout.PrefetchRequestScope);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface PrefetchRequestScope {
+ public interface PrefetchRequestScope {
method public long availableTimeNanos();
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface PrefetchScheduler {
+ public interface PrefetchScheduler {
method public void schedulePrefetch(androidx.compose.foundation.lazy.layout.PrefetchRequest prefetchRequest);
}
@@ -1244,7 +1235,6 @@
@androidx.compose.runtime.Stable public sealed interface LazyStaggeredGridItemScope {
method public androidx.compose.ui.Modifier animateItem(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeInSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset>? placementSpec, optional androidx.compose.animation.core.FiniteAnimationSpec<java.lang.Float>? fadeOutSpec);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public default androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
}
public sealed interface LazyStaggeredGridLayoutInfo {
@@ -1434,8 +1424,8 @@
method public final void requestScrollToPage(@IntRange(from=0L) int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
method public suspend Object? scroll(androidx.compose.foundation.MutatePriority scrollPriority, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.gestures.ScrollScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public final suspend Object? scrollToPage(int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final void updateCurrentPage(androidx.compose.foundation.gestures.ScrollScope, int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final void updateTargetPage(androidx.compose.foundation.gestures.ScrollScope, int targetPage);
+ method public final void updateCurrentPage(androidx.compose.foundation.gestures.ScrollScope, int page, optional @FloatRange(from=-0.5, to=0.5) float pageOffsetFraction);
+ method public final void updateTargetPage(androidx.compose.foundation.gestures.ScrollScope, int targetPage);
property public final boolean canScrollBackward;
property public final boolean canScrollForward;
property public final int currentPage;
@@ -1459,19 +1449,19 @@
package androidx.compose.foundation.relocation {
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public sealed interface BringIntoViewRequester {
+ public sealed interface BringIntoViewRequester {
method public suspend Object? bringIntoView(optional androidx.compose.ui.geometry.Rect? rect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
}
public final class BringIntoViewRequesterKt {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.foundation.relocation.BringIntoViewRequester BringIntoViewRequester();
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewRequester(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewRequester bringIntoViewRequester);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
+ method public static androidx.compose.foundation.relocation.BringIntoViewRequester BringIntoViewRequester();
+ method public static androidx.compose.ui.Modifier bringIntoViewRequester(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewRequester bringIntoViewRequester);
+ method public static androidx.compose.ui.Modifier bringIntoViewResponder(androidx.compose.ui.Modifier, androidx.compose.foundation.relocation.BringIntoViewResponder responder);
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public interface BringIntoViewResponder {
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public suspend Object? bringChildIntoView(kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Rect?> localRect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- method @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.geometry.Rect calculateRectForParent(androidx.compose.ui.geometry.Rect localRect);
+ public interface BringIntoViewResponder {
+ method public suspend Object? bringChildIntoView(kotlin.jvm.functions.Function0<androidx.compose.ui.geometry.Rect?> localRect, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+ method public androidx.compose.ui.geometry.Rect calculateRectForParent(androidx.compose.ui.geometry.Rect localRect);
}
}
@@ -1625,7 +1615,6 @@
public final class ClickableTextKt {
method @Deprecated @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
- method @Deprecated @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi @androidx.compose.runtime.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, kotlin.jvm.functions.Function1<? super java.lang.Integer?,kotlin.Unit> onHover, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional boolean softWrap, optional int overflow, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
@androidx.compose.runtime.Immutable public final class InlineTextContent {
@@ -1777,7 +1766,7 @@
property public final long selection;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public static interface TextFieldBuffer.ChangeList {
+ public static interface TextFieldBuffer.ChangeList {
method public int getChangeCount();
method public long getOriginalRange(int changeIndex);
method public long getRange(int changeIndex);
@@ -1862,7 +1851,7 @@
property public final int Visible;
}
- @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class UndoState {
+ public final class UndoState {
method public void clearHistory();
method public boolean getCanRedo();
method public boolean getCanUndo();
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/DraggableAnchorsBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/DraggableAnchorsBenchmark.kt
index 4a4eacc..8b3472f 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/DraggableAnchorsBenchmark.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/DraggableAnchorsBenchmark.kt
@@ -18,7 +18,6 @@
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.DraggableAnchors
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
@@ -34,7 +33,6 @@
End
}
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(AndroidJUnit4::class)
@Suppress("unused")
@MediumTest
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/OverscrollBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/OverscrollBenchmark.kt
index 4a1bdd2..44e83a9 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/OverscrollBenchmark.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/OverscrollBenchmark.kt
@@ -18,7 +18,6 @@
import android.view.MotionEvent
import android.view.View
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.benchmark.lazy.MotionEventHelper
import androidx.compose.foundation.gestures.Orientation
@@ -111,7 +110,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class OverscrollTestCase : LayeredComposeTestCase(), ToggleableTestCase {
private lateinit var view: View
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyStaggeredGridScrollingBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyStaggeredGridScrollingBenchmark.kt
index e242f16..6752d10 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyStaggeredGridScrollingBenchmark.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/lazy/LazyStaggeredGridScrollingBenchmark.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.benchmark.lazy
import android.os.Build
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
@@ -49,7 +48,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class LazyStaggeredGridScrollingBenchmark(
@@ -174,7 +172,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
class LazyStaggeredGridScrollingTestCase(
private val name: String,
val isVertical: Boolean,
@@ -185,7 +182,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private val Vertical =
LazyStaggeredGridScrollingTestCase("Vertical", isVertical = true) { state ->
LazyVerticalStaggeredGrid(
@@ -199,7 +195,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private val Horizontal =
LazyStaggeredGridScrollingTestCase("Horizontal", isVertical = false) { state ->
LazyHorizontalStaggeredGrid(
@@ -213,7 +208,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
class StaggeredGridRemeasureTestCase(
val firstItemIndex: Int = 0,
val scrollUp: Boolean = false,
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerBasicBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerBasicBenchmark.kt
index 53bfa64..f7cfc42 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerBasicBenchmark.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerBasicBenchmark.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.benchmark.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
@@ -127,7 +126,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
class PagerTestCase(val fullPages: Boolean = true) : LayeredComposeTestCase() {
@Composable
override fun MeasuredContent() {
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerScrollingBenchmark.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerScrollingBenchmark.kt
index 267653a..6b4a985 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerScrollingBenchmark.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/pager/PagerScrollingBenchmark.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.benchmark.pager
import android.os.Build
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.benchmark.lazy.LazyBenchmarkTestCase
import androidx.compose.foundation.benchmark.lazy.LazyItem
import androidx.compose.foundation.benchmark.lazy.toggleStateBenchmark
@@ -51,7 +50,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerScrollingBenchmark(private val testCase: PagerScrollingTestCase) {
@@ -203,7 +201,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
data class PagerScrollingTestCase(
private val name: String,
val isVertical: Boolean,
@@ -217,7 +214,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
class PagerRemeasureTestCase(
val addNewItemOnToggle: Boolean,
val content:
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/TextFieldToggleTextTestCase.kt b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/TextFieldToggleTextTestCase.kt
index fad7cf2..bbdc50c 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/TextFieldToggleTextTestCase.kt
+++ b/compose/foundation/foundation/benchmark/src/androidTest/java/androidx/compose/foundation/benchmark/text/TextFieldToggleTextTestCase.kt
@@ -18,7 +18,6 @@
package androidx.compose.foundation.benchmark.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.requiredWidth
@@ -58,7 +57,6 @@
private val texts =
List(textNumber) { mutableStateOf(textGenerator.nextParagraph(length = textLength)) }
- @OptIn(ExperimentalFoundationApi::class)
@Composable
override fun MeasuredContent() {
for (text in texts) {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/CombinedClickableDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/CombinedClickableDemo.kt
index 5530a05..a4ebbd5 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/CombinedClickableDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/CombinedClickableDemo.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.demos
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.combinedClickable
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/FocusedBoundsDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/FocusedBoundsDemo.kt
index e5c4f02..3701e0f 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/FocusedBoundsDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/FocusedBoundsDemo.kt
@@ -28,7 +28,6 @@
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
@@ -82,7 +81,6 @@
import androidx.compose.ui.viewinterop.AndroidView
@Preview
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun FocusedBoundsDemo() {
// This demo demonstrates multiple observers with two separate observers:
@@ -158,7 +156,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun FocusedBoundsObserver(modifier: Modifier, content: @Composable () -> Unit) {
var coordinates: LayoutCoordinates? by remember { mutableStateOf(null) }
@@ -250,7 +247,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.highlightFocusedBounds() = composed {
var coordinates: LayoutCoordinates? by remember { mutableStateOf(null) }
var focusedChild: LayoutCoordinates? by remember { mutableStateOf(null) }
@@ -280,7 +276,6 @@
.drawAnimatedFocusHighlight(focusedBoundsClipped, focusedBounds)
}
-@OptIn(ExperimentalFoundationApi::class)
private fun calculateHighlightBounds(
child: LayoutCoordinates?,
coordinates: LayoutCoordinates?,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
index 282aefc..0980761 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/ListDemos.kt
@@ -24,7 +24,6 @@
import androidx.compose.animation.core.animateTo
import androidx.compose.animation.core.calculateTargetValue
import androidx.compose.animation.rememberSplineBasedDecay
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
@@ -620,7 +619,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Preview
@Composable
private fun LazyGridWithSpacingDemo() {
@@ -779,7 +777,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun ReorderWithCustomKeys() {
var names by remember { mutableStateOf(listOf("John", "Sara", "Dan")) }
@@ -926,7 +923,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun AnimateItemPlacementDemo() {
val items = remember { mutableStateListOf<Int>().apply { repeat(20) { add(it) } } }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LongScreenshotsDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LongScreenshotsDemos.kt
index 5fc0218..b48f8c0 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LongScreenshotsDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/LongScreenshotsDemos.kt
@@ -21,7 +21,6 @@
import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.TextView
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
@@ -375,7 +374,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun LazyListWithStickiesDemo() {
LazyColumn(Modifier.fillMaxSize()) {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/PopularBooksDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/PopularBooksDemo.kt
index efb086b..accbf32 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/PopularBooksDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/PopularBooksDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -47,7 +46,6 @@
import androidx.compose.ui.unit.dp
@Preview
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun PopularBooksDemo() {
MaterialTheme {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/contextmenu/ComposeTextContextMenu.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/contextmenu/ComposeTextContextMenu.kt
index 3292acb..aedff9f 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/contextmenu/ComposeTextContextMenu.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/contextmenu/ComposeTextContextMenu.kt
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterialApi::class)
package androidx.compose.foundation.demos.contextmenu
import android.widget.EditText
import android.widget.TextView
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement.spacedBy
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewAndroidInteropDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewAndroidInteropDemo.kt
index ed0273e..c27a9bc 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewAndroidInteropDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewAndroidInteropDemo.kt
@@ -19,7 +19,6 @@
import android.content.Context
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import android.widget.HorizontalScrollView
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -42,7 +41,6 @@
import kotlinx.coroutines.launch
// TODO(b/216652644) This demo is currently broken.
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BringIntoViewAndroidInteropDemo() {
Column {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewDemo.kt
index 0e4ee64..2e31f32 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box
@@ -49,7 +48,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BringIntoViewDemo() {
val greenRequester = remember { BringIntoViewRequester() }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewResponderDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewResponderDemo.kt
index 3c0fb35..ef8adbc 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewResponderDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringIntoViewResponderDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.focusable
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -44,7 +43,6 @@
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.round
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BringIntoViewResponderDemo() {
Column {
@@ -82,7 +80,6 @@
return Rect(Offset.Zero, localRect.size)
}
- @ExperimentalFoundationApi
override suspend fun bringChildIntoView(localRect: () -> Rect?) {
// Offset the content right and down by the offset of the
// requested area
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringNestedIntoViewDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringNestedIntoViewDemo.kt
index b2f1a46..1c9e8c3 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringNestedIntoViewDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/BringNestedIntoViewDemo.kt
@@ -18,7 +18,6 @@
package androidx.compose.foundation.demos.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.horizontalScroll
@@ -47,7 +46,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BringNestedIntoViewDemo() {
Column {
@@ -66,7 +64,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun ScrollableGrid(rows: Int, columns: Int, requesters: List<BringIntoViewRequester>) {
Column(
@@ -97,7 +94,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun ControlGrid(rows: Int, columns: Int, requesters: List<BringIntoViewRequester>) {
val coroutineScope = rememberCoroutineScope()
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/RequestRectangleOnScreenDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/RequestRectangleOnScreenDemo.kt
index e934c1b..1333101 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/RequestRectangleOnScreenDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/relocation/RequestRectangleOnScreenDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -35,7 +34,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun RequestRectangleOnScreenDemo() {
val bringIntoViewRequester = remember { BringIntoViewRequester() }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/LazyGridSnappingDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/LazyGridSnappingDemos.kt
index e5cf826..97f877b 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/LazyGridSnappingDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/LazyGridSnappingDemos.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider
@@ -50,7 +49,6 @@
* Snapping happens to the next item and items have the same size. We use the top line in the grid
* as a reference point.
*/
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun GridSingleItemSnapping() {
val lazyGridState = rememberLazyGridState()
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/NonItemBasedSnapping.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/NonItemBasedSnapping.kt
index 51aac37..d582cce 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/NonItemBasedSnapping.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/NonItemBasedSnapping.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.rememberScrollableState
@@ -43,7 +42,6 @@
import kotlin.math.abs
/** A provider that doesn't use the concept of items for snapping. */
-@OptIn(ExperimentalFoundationApi::class)
class NonItemBasedSnappingLayoutInfoProvider(
private val currentOffset: Int,
layoutSize: Int,
@@ -85,7 +83,6 @@
private val ThumbSize = 60.dp
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun NonItemBasedLayout() {
var thumbOffset by remember { mutableStateOf(IntOffset.Zero) }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnapLayoutInfoProvider.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnapLayoutInfoProvider.kt
index 6014262..5425f6e 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnapLayoutInfoProvider.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnapLayoutInfoProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider
import kotlin.math.abs
@@ -26,7 +25,6 @@
import kotlin.math.roundToInt
import kotlin.math.sign
-@OptIn(ExperimentalFoundationApi::class)
fun SnapLayoutInfoProvider(
scrollState: ScrollState,
itemSize: () -> Float,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnappingDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnappingDemos.kt
index 83b1977..76a3d96 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnappingDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/snapping/RowSnappingDemos.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.core.DecayAnimationSpec
import androidx.compose.animation.rememberSplineBasedDecay
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.FlingBehavior
@@ -56,7 +55,6 @@
)
/** Snapping happens to the next item and items have the same size */
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun SinglePageSnapping() {
val scrollState = rememberScrollState()
@@ -70,7 +68,6 @@
}
/** Snapping happens after a decay animation. Items have the same size. */
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun DecayedSnappingDemo() {
val scrollState = rememberScrollState()
@@ -82,7 +79,6 @@
}
/** Snapping happens to at max one view port item's worth distance. */
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun ViewPortBasedSnappingDemo() {
val scrollState = rememberScrollState()
@@ -139,7 +135,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberRowSnapLayoutInfoProvider(
scrollState: ScrollState,
@@ -155,7 +150,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberNextItemSnappingLayoutInfoProvider(
scrollState: ScrollState,
@@ -175,7 +169,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberViewPortSnapLayoutInfoProvider(
scrollState: ScrollState,
@@ -196,7 +189,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberScrollStateLayoutInfoProvider(
scrollState: ScrollState,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/BasicTextMinMaxLinesDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/BasicTextMinMaxLinesDemo.kt
index e9254a6..f8e5d03 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/BasicTextMinMaxLinesDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/BasicTextMinMaxLinesDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
@@ -98,7 +97,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun TextWithMinMaxLines(
text: AnnotatedString,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputFieldMinMaxLines.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputFieldMinMaxLines.kt
index c7a1043..dc4d5af 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputFieldMinMaxLines.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeInputFieldMinMaxLines.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.runtime.Composable
@@ -105,7 +104,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun TextFieldWithMinMaxLines(
str: String? = null,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeTextPointerIcon.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeTextPointerIcon.kt
index 1896978..1cd6960 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeTextPointerIcon.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/ComposeTextPointerIcon.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -114,7 +113,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun IconDemoColumn(overrideDescendants: Boolean) {
val borderMod = Modifier.border(1.dp, Color.LightGray)
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt
index 10cc07d..c8935ec 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt
@@ -23,7 +23,6 @@
import android.text.TextPaint
import androidx.annotation.RequiresApi
import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.demos.text.FontVariationSettingsCompot.compatSetFontVariationSettings
import androidx.compose.foundation.layout.Column
@@ -58,7 +57,6 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
-@OptIn(ExperimentalFoundationApi::class)
@Preview
@Composable
fun VariableFontsDemo() {
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldCustomPinFieldDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldCustomPinFieldDemo.kt
index 49edc3a..84608ea 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldCustomPinFieldDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldCustomPinFieldDemo.kt
@@ -14,14 +14,11 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.demos.text2
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldDemos.kt
index c93b7bf..fc672cd 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldDemos.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.demos.text.TagLine
@@ -115,14 +112,12 @@
Text(text = "Backing state: \"$text\"", style = MaterialTheme.typography.caption)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun PlainBasicTextField() {
val state = remember { TextFieldState() }
BasicTextField(state, demoTextFieldModifiers, textStyle = LocalTextStyle.current)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun SingleLineBasicTextField() {
val state = remember { TextFieldState() }
@@ -134,7 +129,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun MultiLineBasicTextField() {
val state = remember { TextFieldState() }
@@ -146,7 +140,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun StateTogglingBasicTextField() {
var counter by remember { mutableIntStateOf(0) }
@@ -164,7 +157,6 @@
BasicTextField(state, demoTextFieldModifiers, textStyle = LocalTextStyle.current)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BasicTextFieldEditControls() {
var enabled by remember { mutableStateOf(true) }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldInScrollableDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldInScrollableDemo.kt
index 67e62d2..86f5840 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldInScrollableDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldInScrollableDemo.kt
@@ -20,7 +20,6 @@
import android.widget.EditText
import android.widget.LinearLayout
import android.widget.ScrollView
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.demos.text2.ScrollableType2.EditTextsInScrollView
import androidx.compose.foundation.demos.text2.ScrollableType2.LazyColumn
import androidx.compose.foundation.demos.text2.ScrollableType2.ScrollableColumn
@@ -113,7 +112,6 @@
AndroidView(::EditTextsInScrollableView, modifier = Modifier.fillMaxSize())
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun DemoTextField(index: Int) {
val state = rememberTextFieldState()
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldLongTextDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldLongTextDemo.kt
index e81aef5..1423e62 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldLongTextDemo.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldLongTextDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.demos.text.loremIpsumWords
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.imePadding
@@ -28,7 +27,6 @@
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BasicTextFieldLongTextDemo() {
val text = remember { TextFieldState(generateString(charCount = 100_000)) }
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldOutputTransformationDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldOutputTransformationDemos.kt
index 819dc04..5e7b567 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldOutputTransformationDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/BasicTextFieldOutputTransformationDemos.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.demos.text.TagLine
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -71,7 +70,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun InsertReplaceDeleteDemo() {
val state = remember { TextFieldState("abc def ghi") }
@@ -201,7 +199,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun PhoneNumberAsYouTypeDemo() {
BasicTextField(
@@ -213,7 +210,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun PhoneNumberFullTemplateDemo() {
BasicTextField(
@@ -227,7 +223,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Stable
private data class PhoneNumberOutputTransformation(private val pad: Boolean) :
OutputTransformation {
@@ -246,7 +241,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private object OnlyDigitsFilter : InputTransformation {
override fun TextFieldBuffer.transformInput() {
if ("""\D""".toRegex().containsMatchIn(asCharSequence())) {
@@ -255,7 +249,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private val demoDecorationBox = TextFieldDecorator { innerField ->
Box(Modifier.padding(16.dp)) { innerField() }
}
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/CursorDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/CursorDemos.kt
index c106b74..0a48b73 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/CursorDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/CursorDemos.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardActionsDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardActionsDemos.kt
index 89e4d0c1..529dfa9 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardActionsDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardActionsDemos.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.demos.text.TagLine
import androidx.compose.foundation.demos.text.fontSize8
import androidx.compose.foundation.layout.Box
@@ -113,7 +112,6 @@
ImeAction.Done
)
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun KeyboardActionDemoItem(
imeAction: ImeAction,
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardOptionsDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardOptionsDemos.kt
index a46a535..1a47590 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardOptionsDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/KeyboardOptionsDemos.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.demos.text.TagLine
import androidx.compose.foundation.demos.text.fontSize8
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/TextFieldLineLimitsDemos.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/TextFieldLineLimitsDemos.kt
index 45e3719..0f23af6 100644
--- a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/TextFieldLineLimitsDemos.kt
+++ b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text2/TextFieldLineLimitsDemos.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.demos.text2
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.demos.text.TagLine
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -54,7 +53,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun DefaultLineLimits() {
Text("Default")
@@ -67,7 +65,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun SingleLineLimits() {
Text("Single Line")
@@ -80,7 +77,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun MultiLineLimits() {
Text("Multi Line")
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
index c784a18..2df7b65 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyArrangementsTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -52,7 +51,6 @@
import org.junit.Rule
import org.junit.Test
-@OptIn(ExperimentalFoundationApi::class)
class LazyArrangementsTest {
private val ContainerTag = "ContainerTag"
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
index 82e655a..dd7e786 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/grid/LazyGridTest.kt
@@ -20,7 +20,6 @@
import android.os.Build
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
@@ -89,7 +88,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class LazyGridTest(private val orientation: Orientation) :
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/layout/TestPrefetchScheduler.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/layout/TestPrefetchScheduler.kt
index 588beb3..15749fb 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/layout/TestPrefetchScheduler.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/layout/TestPrefetchScheduler.kt
@@ -16,9 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
-
-@OptIn(ExperimentalFoundationApi::class)
internal class TestPrefetchScheduler : PrefetchScheduler {
private var activeRequests = mutableListOf<PrefetchRequest>()
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyCustomKeysTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyCustomKeysTest.kt
index cab2ad8..9b4cd7c 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyCustomKeysTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyCustomKeysTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.list
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
@@ -47,7 +46,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class LazyCustomKeysTest {
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListHeadersTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListHeadersTest.kt
index 25cf39e..08d3411 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListHeadersTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListHeadersTest.kt
@@ -18,7 +18,6 @@
package androidx.compose.foundation.lazy.list
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.ScrollableDefaults
import androidx.compose.foundation.gestures.scrollBy
@@ -56,7 +55,6 @@
@LargeTest
@RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class LazyListHeadersTest {
private val LazyListTag = "LazyList"
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListItemPlacementAnimationTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListItemPlacementAnimationTest.kt
index e3e55ef..637b798 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListItemPlacementAnimationTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListItemPlacementAnimationTest.kt
@@ -24,7 +24,6 @@
import androidx.compose.animation.core.VisibilityThreshold
import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -452,7 +451,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun moveItemToTheTopOutsideOfBounds_withStickyHeader() {
var list by mutableStateOf(listOf(0, 1, 2, 3, 4))
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListTest.kt
index 4b5b275..5eb45a6 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/list/LazyListTest.kt
@@ -24,7 +24,6 @@
import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.tween
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.VelocityTrackerCalculationThreshold
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
@@ -2072,7 +2071,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Composable
private fun LazyListInLookaheadScope(
list: List<Int>,
@@ -2145,7 +2143,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun animContentSizeWithPlacementAnimator() {
val lookaheadPosition = mutableMapOf<Int, Int>()
@@ -2323,7 +2320,6 @@
assert(assertedSmallItems)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun animVisibilityWithPlacementAnimator() {
val lookaheadPosition = mutableMapOf<Int, Int>()
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/BaseLazyStaggeredGridWithOrientation.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/BaseLazyStaggeredGridWithOrientation.kt
index aeee825..bd4e2c4 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/BaseLazyStaggeredGridWithOrientation.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/BaseLazyStaggeredGridWithOrientation.kt
@@ -19,7 +19,6 @@
import androidx.compose.animation.core.snap
import androidx.compose.foundation.AutoTestFrameClock
import androidx.compose.foundation.BaseLazyLayoutTestWithOrientation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.layout.Arrangement
@@ -33,7 +32,6 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
-@OptIn(ExperimentalFoundationApi::class)
open class BaseLazyStaggeredGridWithOrientation(private val orientation: Orientation) :
BaseLazyLayoutTestWithOrientation(orientation) {
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
index ecaf915..97e2cab 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimatedScrollTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.core.FloatSpringSpec
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.lazy.grid.isEqualTo
@@ -43,7 +42,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class LazyStaggeredGridAnimatedScrollTest(orientation: Orientation) :
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
index 46aa36f..db88977 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridContentPaddingTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Spacer
@@ -32,7 +31,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class LazyStaggeredGridContentPaddingTest(orientation: Orientation) :
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPinnableContainerTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPinnableContainerTest.kt
index 89bb3bf..855edd6 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPinnableContainerTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPinnableContainerTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.list.assertIsNotPlaced
@@ -43,7 +42,6 @@
import org.junit.Rule
import org.junit.Test
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
class LazyStaggeredGridPinnableContainerTest {
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
index 42f61c3..cb971be 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridPrefetcherTest.kt
@@ -19,7 +19,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
@@ -48,7 +47,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class LazyStaggeredGridPrefetcherTest(orientation: Orientation) :
@@ -70,7 +68,6 @@
internal lateinit var state: LazyStaggeredGridState
private val scheduler = TestPrefetchScheduler()
- @OptIn(ExperimentalFoundationApi::class)
@Composable
fun rememberState(
initialFirstVisibleItemIndex: Int = 0,
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridReverseLayoutTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridReverseLayoutTest.kt
index 9dc95ee..63afd6a 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridReverseLayoutTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridReverseLayoutTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size
@@ -37,7 +36,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(Parameterized::class)
class LazyStaggeredGridReverseLayoutTest(
val orientation: Orientation,
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
index 3204ad9..5b3ed975 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemanticTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.text.BasicText
@@ -36,7 +35,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class LazyStaggeredGridSemanticTest(private val orientation: Orientation) :
diff --git a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
index c411a8e..0cba264 100644
--- a/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
+++ b/compose/foundation/foundation/integration-tests/lazy-tests/src/androidTest/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridTest.kt
@@ -19,7 +19,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
@@ -63,7 +62,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class LazyStaggeredGridTest(private val orientation: Orientation) :
diff --git a/compose/foundation/foundation/lint-baseline.xml b/compose/foundation/foundation/lint-baseline.xml
index 82eb5b8..3978436 100644
--- a/compose/foundation/foundation/lint-baseline.xml
+++ b/compose/foundation/foundation/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.6.0-alpha03" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha03)" variant="all" version="8.6.0-alpha03">
+<issues format="6" by="lint 8.6.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha05)" variant="all" version="8.6.0-alpha05">
<issue
id="PrimitiveInCollection"
@@ -219,7 +219,7 @@
<issue
id="PrimitiveInCollection"
- message="variable varb332e6bb with type List<Integer>: replace with IntList"
+ message="variable varb332d665 with type List<Integer>: replace with IntList"
errorLine1=" get() = _headerIndexes ?: emptyList()"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -237,7 +237,7 @@
<issue
id="PrimitiveInCollection"
- message="variable varb333823e with type List<Integer>: replace with IntList"
+ message="variable varb3336cf1 with type List<Integer>: replace with IntList"
errorLine1=" val headersIndexes = _headerIndexes ?: mutableListOf<Int>().also { _headerIndexes = it }"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/AnchoredDraggableSample.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/AnchoredDraggableSample.kt
index 735cc00..baf477f 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/AnchoredDraggableSample.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/AnchoredDraggableSample.kt
@@ -14,14 +14,11 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.samples
import androidx.compose.animation.core.AnimationSpec
import androidx.compose.animation.core.animate
import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.gestures.AnchoredDraggableDefaults
@@ -225,7 +222,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Preview
@Composable
fun AnchoredDraggableWithOverscrollSample() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicMarqueeSamples.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicMarqueeSamples.kt
index 1322b60..166bf5e 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicMarqueeSamples.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicMarqueeSamples.kt
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class, ExperimentalTextApi::class)
+@file:OptIn(ExperimentalTextApi::class)
package androidx.compose.foundation.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.MarqueeAnimationMode
import androidx.compose.foundation.MarqueeSpacing
import androidx.compose.foundation.basicMarquee
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicTextFieldValueSample.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicTextFieldValueSample.kt
index 900b5d9..9119585 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicTextFieldValueSample.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BasicTextFieldValueSample.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.runtime.Composable
@@ -95,7 +94,6 @@
* @param writeSelectionFromTextFieldValue If true, [update] will synchronize the selection from the
* [TextFieldValue] to the [TextFieldState]. The text will be synchronized regardless.
*/
-@OptIn(ExperimentalFoundationApi::class)
private class StateSyncingModifier(
private val state: TextFieldState,
private val value: TextFieldValue,
@@ -125,7 +123,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class StateSyncingModifierNode(
private val state: TextFieldState,
private var onValueChanged: (TextFieldValue) -> Unit,
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BringIntoViewSamples.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BringIntoViewSamples.kt
index 111789a..c4e884b 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BringIntoViewSamples.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/BringIntoViewSamples.kt
@@ -18,7 +18,6 @@
import androidx.annotation.Sampled
import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box
@@ -43,7 +42,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun BringIntoViewSample() {
@@ -71,7 +69,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun BringPartOfComposableIntoViewSample() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/DragAndDropSamples.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/DragAndDropSamples.kt
index d3e1387..75dd94e 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/DragAndDropSamples.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/DragAndDropSamples.kt
@@ -29,7 +29,6 @@
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.draganddrop.dragAndDropSource
@@ -110,7 +109,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun TextDragAndDropSourceSample(modifier: Modifier) {
@@ -144,7 +142,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun TextDragAndDropTargetSample(
@@ -283,7 +280,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun DragAndDropSourceWithColoredDragShadowSample(color: Color) {
@@ -325,7 +321,6 @@
.offset(state.animatedTranslation, state.animatedTranslation)
}
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.stateDragSource(state: State) =
dragAndDropSource(
drawDragDecoration = { drawRoundRect(state.color) },
@@ -333,7 +328,6 @@
detectTapGestures(onLongPress = { startTransfer(state.color.toDragAndDropTransfer()) })
}
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.stateDropTarget(state: State) =
dragAndDropTarget(
shouldStartDragAndDrop = { startEvent ->
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/LazyDslSamples.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/LazyDslSamples.kt
index 3db1162..b52f91b 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/LazyDslSamples.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/LazyDslSamples.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
@@ -73,7 +72,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun StickyHeaderSample() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/OverscrollSample.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/OverscrollSample.kt
index 43f3868..6e7f875 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/OverscrollSample.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/OverscrollSample.kt
@@ -19,7 +19,6 @@
import androidx.annotation.Sampled
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.OverscrollEffect
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
@@ -55,11 +54,9 @@
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun OverscrollSample() {
- @OptIn(ExperimentalFoundationApi::class)
// our custom offset overscroll that offset the element it is applied to when we hit the bound
// on the scrollable container.
class OffsetOverscrollEffect(val scope: CoroutineScope) : OverscrollEffect {
@@ -180,7 +177,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun OverscrollWithDraggable_After() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/PagerSamples.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/PagerSamples.kt
index c07fcdc..0ee582c 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/PagerSamples.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/PagerSamples.kt
@@ -18,7 +18,6 @@
import androidx.annotation.Sampled
import androidx.compose.animation.core.animate
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -111,7 +110,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun PagerCustomAnimateScrollToPage() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/SnapFlingBehaviorSample.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/SnapFlingBehaviorSample.kt
index 02fb1a0..28e7fe1 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/SnapFlingBehaviorSample.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/SnapFlingBehaviorSample.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.snapping.SnapLayoutInfoProvider
import androidx.compose.foundation.gestures.snapping.SnapPosition
@@ -39,7 +38,6 @@
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun SnapFlingBehaviorSimpleSample() {
@@ -63,7 +61,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun SnapFlingBehaviorCustomizedSample() {
@@ -91,7 +88,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun SnapFlingBehaviorSnapPosition() {
diff --git a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/TransformableSample.kt b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/TransformableSample.kt
index 4611d7e..e7cfccf 100644
--- a/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/TransformableSample.kt
+++ b/compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/TransformableSample.kt
@@ -103,7 +103,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
@Composable
fun TransformableSampleInsideScroll() {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicMarqueeTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicMarqueeTest.kt
index 6624703..c9d94f9e 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicMarqueeTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicMarqueeTest.kt
@@ -70,7 +70,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(AndroidJUnit4::class)
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicTooltipTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicTooltipTest.kt
index 786de25..3da96f9 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicTooltipTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/BasicTooltipTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation
import android.os.Build
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ClickableInScrollableViewGroupTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ClickableInScrollableViewGroupTest.kt
index bc40cd9..59a4407 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ClickableInScrollableViewGroupTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ClickableInScrollableViewGroupTest.kt
@@ -47,7 +47,6 @@
/** Test for [clickable] [PressInteraction] behavior in scrollable [ViewGroup]s. */
@MediumTest
@RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class ClickableInScrollableViewGroupTest {
@get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableParameterizedKeyInputTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableParameterizedKeyInputTest.kt
index fef6ff7..6c04ddb 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableParameterizedKeyInputTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableParameterizedKeyInputTest.kt
@@ -47,7 +47,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class CombinedClickableParameterizedKeyInputTest(keyCode: Long) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableTest.kt
index a73449f..be436e1 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/CombinedClickableTest.kt
@@ -105,7 +105,6 @@
@MediumTest
@RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class CombinedClickableTest {
@get:Rule val rule = createComposeRule()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/Draggable2DTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/Draggable2DTest.kt
index 1b6c8fa..cdd939a 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/Draggable2DTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/Draggable2DTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation
import androidx.compose.foundation.gestures.Draggable2DState
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusGroupTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusGroupTest.kt
index d972bac..93ca057 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusGroupTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusGroupTest.kt
@@ -421,6 +421,6 @@
modifier: Modifier = Modifier,
noinline content: @Composable BoxScope.() -> Unit = {}
) {
- @OptIn(ExperimentalFoundationApi::class) Box(modifier.focusGroup(), content)
+ Box(modifier.focusGroup(), content)
}
}
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableBoundsTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableBoundsTest.kt
index eb70838..b511741 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableBoundsTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableBoundsTest.kt
@@ -45,7 +45,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class FocusableBoundsTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableTest.kt
index 353e591..145fb9a 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/FocusableTest.kt
@@ -80,7 +80,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class FocusableTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/InteractionSourceTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/InteractionSourceTest.kt
index 9eb578a..5c51590 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/InteractionSourceTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/InteractionSourceTest.kt
@@ -40,7 +40,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@ExperimentalFoundationApi
@MediumTest
@RunWith(AndroidJUnit4::class)
class InteractionSourceTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollScreenshotTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollScreenshotTest.kt
index 8c44a81..df2745e 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollScreenshotTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollScreenshotTest.kt
@@ -132,7 +132,6 @@
.assertAgainstGolden(screenshotRule, "overscroll_right_origin")
}
- @OptIn(ExperimentalFoundationApi::class)
@Composable
fun VerticalScrollable() {
CompositionLocalProvider(
@@ -151,7 +150,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Composable
fun HorizontalScrollable() {
CompositionLocalProvider(
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollTest.kt
index 45d9638..8866e449 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/OverscrollTest.kt
@@ -74,7 +74,6 @@
@MediumTest
@RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class OverscrollTest {
@get:Rule val rule = createComposeRule()
@@ -321,7 +320,6 @@
assertThat(first).isEqualTo(second)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O, maxSdkVersion = Build.VERSION_CODES.R)
fun glowOverscroll_doesNotClip() {
@@ -375,7 +373,6 @@
rule.onNodeWithTag(tag).captureToImage().assertHasNoColor(Color.Red)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_doesNotClipCrossAxis_verticalOverscroll() {
@@ -462,7 +459,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_doesNotClipCrossAxis_horizontalOverscroll() {
@@ -549,7 +545,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_clipsBothAxes_overscrollInBothDirections() {
@@ -642,7 +637,6 @@
* when stretching down, or if there are no pixels (transparent) there, this will cause any
* background underneath the content to become visible.
*/
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_doesNotIncludeUnclippedPixels_verticalOverscroll() {
@@ -695,7 +689,6 @@
rule.onNodeWithTag(tag).captureToImage().assertHasNoColor(Color.Red)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_doesNotIncludeUnclippedPixels_horizontalOverscroll() {
@@ -748,7 +741,6 @@
rule.onNodeWithTag(tag).captureToImage().assertHasNoColor(Color.Red)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
fun stretchOverscroll_doesNotIncludeUnclippedPixels_overscrollInBothDirections() {
@@ -801,7 +793,6 @@
rule.onNodeWithTag(tag).captureToImage().assertHasNoColor(Color.Red)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
fun zeroSizedEffectIsNotConsumingOffsetsAndVelocity() {
@@ -837,7 +828,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
fun notAttachedEffectIsNotConsumingOffsetsAndVelocity() {
@@ -1143,7 +1133,6 @@
}
}
- @ExperimentalFoundationApi
@MediumTest
@Test
fun testOverscrollCallbacks_verticalSwipeUp_shouldTriggerCallbacks() {
@@ -1190,7 +1179,6 @@
rule.waitUntil { drawCount == 1 }
}
- @ExperimentalFoundationApi
@MediumTest
@Test
fun testOverscrollCallbacks_verticalScrollMouse_shouldNotTriggerCallbacks() {
@@ -1228,7 +1216,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private fun ComposeContentTestRule.setOverscrollContentAndReturnViewConfig(
scrollableState: ScrollableState,
overscrollEffect: OverscrollEffect,
@@ -1288,7 +1275,6 @@
}
// Custom offset overscroll that only counts the number of times each callback is triggered.
-@OptIn(ExperimentalFoundationApi::class)
private class OffsetOverscrollEffectCounter : OverscrollEffect {
var applyToScrollCount: Int = 0
private set
@@ -1296,7 +1282,6 @@
var applyToFlingCount: Int = 0
private set
- @ExperimentalFoundationApi
override fun applyToScroll(
delta: Offset,
source: NestedScrollSource,
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ScrollableTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ScrollableTest.kt
index f928471..c4d5f68 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ScrollableTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/ScrollableTest.kt
@@ -1182,7 +1182,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun focusScroll_nestedScroll_childPartialConsumptionForSemantics() {
var outerDrag = 0f
@@ -2605,7 +2604,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun producingEqualMaterializedModifierAfterRecomposition() {
val state = ScrollableState { it }
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/StretchOverscrollTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/StretchOverscrollTest.kt
index d2daef8..9787779 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/StretchOverscrollTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/StretchOverscrollTest.kt
@@ -44,7 +44,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
@RunWith(AndroidJUnit4::class)
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/TransformableTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/TransformableTest.kt
index 41fa42a..2a74fc4 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/TransformableTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/TransformableTest.kt
@@ -173,7 +173,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun transformable_pan_disallowed() {
var cumulativePan = Offset.Zero
@@ -214,7 +213,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun transformableInsideScroll_pan_disallowed_parentScrolls() {
var touchSlop = 0f
@@ -249,7 +247,6 @@
rule.runOnIdle { assertThat(scrollState.value).isEqualTo(50) }
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun transformableInsideScroll_canPan_offsetProvided() {
var lastCanPanOffset = Offset.Zero
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDragScopeAsScrollScope.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDragScopeAsScrollScope.kt
index 549f975..a19fdfb 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDragScopeAsScrollScope.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDragScopeAsScrollScope.kt
@@ -16,12 +16,10 @@
package androidx.compose.foundation.anchoredDraggable
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.AnchoredDragScope
import androidx.compose.foundation.gestures.AnchoredDraggableState
import androidx.compose.foundation.gestures.ScrollScope
-@OptIn(ExperimentalFoundationApi::class)
internal fun AnchoredDragScope.asScrollScope(state: AnchoredDraggableState<*>) =
object : ScrollScope {
override fun scrollBy(pixels: Float): Float {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableBackwardsCompatibleTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableBackwardsCompatibleTest.kt
index 9785465..b11ce3a 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableBackwardsCompatibleTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableBackwardsCompatibleTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.core.AnimationSpec
import androidx.compose.animation.core.DecayAnimationSpec
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.OverscrollEffect
import androidx.compose.foundation.gestures.AnchoredDraggableDefaults
import androidx.compose.foundation.gestures.AnchoredDraggableMinFlingVelocity
@@ -40,7 +39,6 @@
* Test helper that allows to test either old or new anchored draggable overloads before/after
* aosp/3012013.
*/
-@OptIn(ExperimentalFoundationApi::class)
abstract class AnchoredDraggableBackwardsCompatibleTest(private val testNewBehavior: Boolean) {
@get:Rule val rule = createComposeRule()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableDecayAnimationTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableDecayAnimationTest.kt
index 5222f99..b00b27d 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableDecayAnimationTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableDecayAnimationTest.kt
@@ -19,7 +19,6 @@
import androidx.compose.animation.core.FloatDecayAnimationSpec
import androidx.compose.animation.core.generateDecayAnimationSpec
import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.DraggableAnchors
import androidx.compose.foundation.gestures.animateToWithDecay
import androidx.compose.runtime.getValue
@@ -40,7 +39,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(Parameterized::class)
@LargeTest
class AnchoredDraggableDecayAnimationTest(testNewBehavior: Boolean) :
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableGestureTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableGestureTest.kt
index 3db54694..97adac1 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableGestureTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableGestureTest.kt
@@ -19,7 +19,6 @@
import androidx.compose.animation.core.tween
import androidx.compose.foundation.AtomicLong
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.A
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.B
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.C
@@ -72,7 +71,6 @@
@RunWith(Parameterized::class)
@LargeTest
-@OptIn(ExperimentalFoundationApi::class)
class AnchoredDraggableGestureTest(testNewBehavior: Boolean) :
AnchoredDraggableBackwardsCompatibleTest(testNewBehavior) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableOverscrollTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableOverscrollTest.kt
index 40f2b8f..be8aeec 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableOverscrollTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableOverscrollTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.SplineBasedFloatDecayAnimationSpec
import androidx.compose.animation.core.generateDecayAnimationSpec
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.OverscrollEffect
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.A
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.B
@@ -56,7 +55,6 @@
@RunWith(Parameterized::class)
@LargeTest
-@OptIn(ExperimentalFoundationApi::class)
class AnchoredDraggableOverscrollTest(testNewBehavior: Boolean) :
AnchoredDraggableBackwardsCompatibleTest(testNewBehavior) {
@@ -298,7 +296,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class TestOverscrollEffect : OverscrollEffect {
var applyToScrollCalledCount: Int = 0
private set
@@ -312,7 +309,6 @@
var flingOverscrollVelocity: Velocity = Velocity.Zero
private set
- @ExperimentalFoundationApi
override fun applyToScroll(
delta: Offset,
source: NestedScrollSource,
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableStateTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableStateTest.kt
index ced6cfa..7109852 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableStateTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableStateTest.kt
@@ -30,7 +30,6 @@
import androidx.compose.animation.core.generateDecayAnimationSpec
import androidx.compose.animation.core.tween
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.A
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.B
import androidx.compose.foundation.anchoredDraggable.AnchoredDraggableTestValue.C
@@ -91,7 +90,6 @@
@RunWith(Parameterized::class)
@LargeTest
-@OptIn(ExperimentalFoundationApi::class)
class AnchoredDraggableStateTest(testNewBehavior: Boolean) :
AnchoredDraggableBackwardsCompatibleTest(testNewBehavior) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableTestState.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableTestState.kt
index 794c1ea..fc5052e 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableTestState.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/anchoredDraggable/AnchoredDraggableTestState.kt
@@ -16,11 +16,9 @@
package androidx.compose.foundation.anchoredDraggable
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.AnchoredDraggableState
import androidx.compose.foundation.gestures.DraggableAnchors
-@ExperimentalFoundationApi
internal fun <T> AnchoredDraggableTestState(
initialValue: T,
anchors: DraggableAnchors<T>? = null,
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/content/ReceiveContentTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/content/ReceiveContentTest.kt
index 7b0b81a..517956a 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/content/ReceiveContentTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/content/ReceiveContentTest.kt
@@ -869,10 +869,8 @@
private val defaultIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://example.com"))
private val defaultUri = Uri.parse("content://com.example.app/image")
-@OptIn(ExperimentalFoundationApi::class)
private val MediaType.Companion.Video: MediaType
get() = MediaType("video/*")
-@OptIn(ExperimentalFoundationApi::class)
private val MediaType.Companion.Audio: MediaType
get() = MediaType("audio/*")
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/draganddrop/DragDropTargetTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/draganddrop/DragDropTargetTest.kt
index a60394c..5fb3154 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/draganddrop/DragDropTargetTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/draganddrop/DragDropTargetTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.draganddrop
import android.view.View
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.content.testDragAndDrop
import androidx.compose.foundation.layout.Box
@@ -42,7 +41,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(AndroidJUnit4::class)
@MediumTest
class DragDropTargetTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapFlingBehaviorTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapFlingBehaviorTest.kt
index d30e686..77c4696 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapFlingBehaviorTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapFlingBehaviorTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.Orientation
@@ -61,7 +60,6 @@
@LargeTest
@RunWith(Parameterized::class)
-@OptIn(ExperimentalFoundationApi::class)
class LazyGridSnapFlingBehaviorTest(private val orientation: Orientation) :
BaseLazyGridTestWithOrientation(orientation) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapLayoutInfoProviderTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapLayoutInfoProviderTest.kt
index a0187b37..860eaeb 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapLayoutInfoProviderTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyGridSnapLayoutInfoProviderTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
@@ -39,7 +38,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class LazyGridSnapLayoutInfoProviderTest(orientation: Orientation) :
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapFlingBehaviorTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapFlingBehaviorTest.kt
index b95edb7..c1d7020 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapFlingBehaviorTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapFlingBehaviorTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.ScrollScope
@@ -57,7 +56,6 @@
@LargeTest
@RunWith(Parameterized::class)
-@OptIn(ExperimentalFoundationApi::class)
class LazyListSnapFlingBehaviorTest(private val orientation: Orientation) :
BaseLazyListTestWithOrientation(orientation) {
@@ -447,7 +445,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class QuerySnapFlingBehavior(
val snapFlingBehavior: TargetedFlingBehavior,
val onAnimationStep: (Float) -> Unit
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapLayoutInfoProviderTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapLayoutInfoProviderTest.kt
index 28ad641..f36ca53 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapLayoutInfoProviderTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/LazyListSnapLayoutInfoProviderTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
@@ -38,7 +37,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class LazyListSnapLayoutInfoProviderTest(orientation: Orientation) :
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehaviorTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehaviorTest.kt
index 2ef6ba5..f9f245d 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehaviorTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehaviorTest.kt
@@ -26,7 +26,6 @@
import androidx.compose.animation.core.calculateTargetValue
import androidx.compose.animation.core.generateDecayAnimationSpec
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.TestScrollMotionDurationScale
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.TargetedFlingBehavior
@@ -68,7 +67,6 @@
@MediumTest
@RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class SnapFlingBehaviorTest {
@get:Rule val rule = createComposeRule()
@@ -477,7 +475,6 @@
}
@Suppress("Deprecation")
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun VelocityEffect(
testFlingBehavior: FlingBehavior,
@@ -537,7 +534,6 @@
private const val MinOffset = -200f
private const val MaxOffset = 300f
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberSnapFlingBehavior(
snapLayoutInfoProvider: SnapLayoutInfoProvider,
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/BasePagerTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/BasePagerTest.kt
index 896baac..105c230 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/BasePagerTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/BasePagerTest.kt
@@ -18,7 +18,6 @@
import android.view.View
import androidx.compose.foundation.BaseLazyLayoutTestWithOrientation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.LocalOverscrollConfiguration
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
@@ -64,7 +63,6 @@
import kotlin.test.assertTrue
import kotlinx.coroutines.CoroutineScope
-@OptIn(ExperimentalFoundationApi::class)
open class BasePagerTest(private val config: ParamConfig) :
BaseLazyLayoutTestWithOrientation(config.orientation) {
@@ -299,7 +297,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun HorizontalOrVerticalPager(
state: PagerState = rememberPagerState(pageCount = { DefaultPageCount }),
@@ -391,7 +388,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
class ParamConfig(
val orientation: Orientation,
val reverseLayout: Boolean = false,
@@ -417,7 +413,6 @@
internal const val DefaultAnimationRepetition = 2
internal val TestOrientation = listOf(Orientation.Vertical, Orientation.Horizontal)
-@OptIn(ExperimentalFoundationApi::class)
internal val AllOrientationsParams =
mutableListOf<ParamConfig>().apply {
for (orientation in TestOrientation) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageCountTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageCountTest.kt
index 7ecc150..779ba1e 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageCountTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageCountTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.ui.Modifier
@@ -30,7 +29,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PageCountTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageSizeTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageSizeTest.kt
index d27e8fcc..c245ce1 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageSizeTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PageSizeTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
import androidx.compose.ui.test.assertIsDisplayed
@@ -29,7 +28,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PageSizeTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerAccessibilityTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerAccessibilityTest.kt
index db9f9743..7684add 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerAccessibilityTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerAccessibilityTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import android.view.accessibility.AccessibilityNodeProvider
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
@@ -43,7 +42,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(Parameterized::class)
class PagerAccessibilityTest(config: ParamConfig) : BasePagerTest(config = config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentPaddingTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentPaddingTest.kt
index f7c92c5..2a8bb2c 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentPaddingTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentPaddingTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.core.snap
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.ScrollableState
import androidx.compose.foundation.gestures.animateScrollBy
@@ -50,7 +49,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
internal class PagerContentPaddingTest(paramConfig: ParamConfig) : BasePagerTest(paramConfig) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentTest.kt
index 96dc082..628d9d2 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerContentTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import android.os.Build
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
@@ -54,7 +53,6 @@
@get:Rule val rule = createComposeRule()
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun pageContent_makeSureContainerOwnsOutsideModifiers() {
// Arrange
@@ -81,7 +79,6 @@
rule.runOnIdle { assertTrue { state.currentPage != 0 } }
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
fun pageContent_makeSureInnerModifiersAreAppliedToPages() {
@@ -114,7 +111,6 @@
rule.onNodeWithTag(PagerTestTag).captureToImage().assertPixels { Color.Green }
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun scrollableState_isScrollableWhenChangingPages() {
val states = mutableMapOf<Int, ScrollState>()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCrossAxisTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCrossAxisTest.kt
index 112a18f..85f9a32 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCrossAxisTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCrossAxisTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -43,7 +42,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerCrossAxisTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCustomKeyTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCustomKeyTest.kt
index 1ef2d56..e0ee5f1 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCustomKeyTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerCustomKeyTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
@@ -28,7 +27,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class PagerCustomKeyTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerGestureTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerGestureTest.kt
index 8519f84..2c8f138 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerGestureTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerGestureTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.snapping.MinFlingVelocityDp
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
@@ -28,7 +27,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class PagerGestureTest(private val paramConfig: ParamConfig) : BasePagerTest(config = paramConfig) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerLayoutInfoTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerLayoutInfoTest.kt
index f6f40a0..1c8e4b0 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerLayoutInfoTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerLayoutInfoTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
@@ -43,7 +42,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(Parameterized::class)
class PagerLayoutInfoTest(private val param: ParamConfig) : BasePagerTest(param) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerNestedScrollContentTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerNestedScrollContentTest.kt
index 3e5badf..b5d6f98 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerNestedScrollContentTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerNestedScrollContentTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import androidx.compose.animation.splineBasedDecay
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.DefaultFlingBehavior
import androidx.compose.foundation.gestures.FlingBehavior
@@ -64,12 +63,10 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerNestedScrollContentTest(config: ParamConfig) : BasePagerTest(config = config) {
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldNotPropagateUnconsumedFlings() {
// Arrange
@@ -105,7 +102,6 @@
assertEquals(pagerState.currentPageOffsetFraction, 0f, 0.01f)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldCancelFlingIfOnEdge() {
// Arrange
@@ -154,7 +150,6 @@
assertThat(pagerState.currentPageOffsetFraction).isNotEqualTo(previousOffset)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldPropagateCrossAxisUnconsumedFlings() {
// Arrange
@@ -221,7 +216,6 @@
assertThat(mainAxisScrollAvailable.absoluteValue).isEqualTo(0f)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldPropagateScrollCorrectly() {
// Arrange
@@ -272,7 +266,6 @@
assertThat(pagerState.currentPageOffsetFraction).isEqualTo(0f)
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldEnsurePagerIsSettled_WhenDirectionChanges() {
// Arrange
@@ -333,7 +326,6 @@
rule.onNodeWithTag(TestTag).performTouchInput { up() }
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun nestedScrollContent_shouldEnsurePagerIsSettled_WhenCrossDirectionScrolls() {
// Arrange
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPinnableContainerTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPinnableContainerTest.kt
index 314820a..182f9dd 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPinnableContainerTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPinnableContainerTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
@@ -48,7 +47,6 @@
import org.junit.Rule
import org.junit.Test
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
class PagerPinnableContainerTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPrefetcherTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPrefetcherTest.kt
index 5b9efe3..4d15a79 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPrefetcherTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerPrefetcherTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.ScrollableState
import androidx.compose.foundation.gestures.scrollBy
@@ -46,7 +45,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerPrefetcherTest(private val paramConfig: ParamConfig) : BasePagerTest(paramConfig) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateNonGestureScrollingTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateNonGestureScrollingTest.kt
index 43072ec..2647de2 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateNonGestureScrollingTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateNonGestureScrollingTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.gestures.snapping.SnapPosition
import androidx.compose.foundation.gestures.snapping.calculateDistanceToDesiredSnapPosition
@@ -55,7 +54,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerStateNonGestureScrollingTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateTest.kt
index c46e880..f5c8801 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerStateTest.kt
@@ -24,7 +24,6 @@
import androidx.compose.animation.core.tween
import androidx.compose.animation.splineBasedDecay
import androidx.compose.foundation.AutoTestFrameClock
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.foundation.gestures.TargetedFlingBehavior
@@ -47,7 +46,6 @@
import kotlinx.coroutines.withContext
import org.junit.Test
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
class PagerStateTest : SingleParamBasePagerTest() {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerSwipeEdgeTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerSwipeEdgeTest.kt
index 11e451d..3e64cab 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerSwipeEdgeTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerSwipeEdgeTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.snapping.MinFlingVelocityDp
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
@@ -31,7 +30,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerSwipeEdgeTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerTest.kt
index 38c47b9..d17f38b 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/PagerTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.gestures.snapping.SnapPosition
@@ -49,7 +48,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class PagerTest(val config: ParamConfig) : BasePagerTest(config) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/SingleParamBasePagerTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/SingleParamBasePagerTest.kt
index 3d6910e..c41ddb9 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/SingleParamBasePagerTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/SingleParamBasePagerTest.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.pager
import android.view.View
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.LocalOverscrollConfiguration
import androidx.compose.foundation.background
import androidx.compose.foundation.focusable
@@ -65,7 +64,6 @@
* Transition BasePagerTest to be used whilst we adopt [ParameterizedInCompositionRule] in the
* necessary Pager Tests.
*/
-@OptIn(ExperimentalFoundationApi::class)
open class SingleParamBasePagerTest {
@get:Rule val rule = createParameterizedComposeTestRule<SingleParamConfig>()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/TestPrefetchScheduler.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/TestPrefetchScheduler.kt
index ee02702..ab9a041 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/TestPrefetchScheduler.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/pager/TestPrefetchScheduler.kt
@@ -16,12 +16,10 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.PrefetchRequest
import androidx.compose.foundation.lazy.layout.PrefetchRequestScope
import androidx.compose.foundation.lazy.layout.PrefetchScheduler
-@OptIn(ExperimentalFoundationApi::class)
internal class TestPrefetchScheduler : PrefetchScheduler {
private var activeRequests = mutableListOf<PrefetchRequest>()
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequesterViewIntegrationTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequesterViewIntegrationTest.kt
index 9eb384f..fdb6405 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequesterViewIntegrationTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequesterViewIntegrationTest.kt
@@ -20,7 +20,6 @@
import android.graphics.Rect as AndroidRect
import android.view.View
import android.widget.FrameLayout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.size
@@ -45,7 +44,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class BringIntoViewRequesterViewIntegrationTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponderTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponderTest.kt
index da17d00..ba1e44e 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponderTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponderTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.TestActivity
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.offset
@@ -44,7 +43,7 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class, ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
@SmallTest
@RunWith(AndroidJUnit4::class)
class BringIntoViewResponderTest {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewScrollableInteractionTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewScrollableInteractionTest.kt
index 627465c..be0eebd 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewScrollableInteractionTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/BringIntoViewScrollableInteractionTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.ScrollingLayoutElement
import androidx.compose.foundation.background
@@ -74,7 +73,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalFoundationApi::class)
@LargeTest
@RunWith(Parameterized::class)
class BringIntoViewScrollableInteractionTest(private val orientation: Orientation) {
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/FakeScrollable.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/FakeScrollable.kt
index 7720cd2..d5352a3 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/FakeScrollable.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/relocation/FakeScrollable.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -29,7 +28,6 @@
* [onBringIntoView]. Note that [onBringIntoView] will not be called if [parentOffset] is zero,
* since that means the scrollable doesn't actually need to scroll anything to satisfy the request.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal fun Modifier.fakeScrollable(
parentOffset: Offset = Offset.Zero,
onBringIntoView: suspend (() -> Rect?) -> Unit
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/ClickableTextTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/ClickableTextTest.kt
index f26a0d7..08a60bc6 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/ClickableTextTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/ClickableTextTest.kt
@@ -16,15 +16,12 @@
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performMouseInput
import androidx.compose.ui.text.AnnotatedString
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
@@ -32,12 +29,9 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.any
-import org.mockito.kotlin.argWhere
-import org.mockito.kotlin.inOrder
import org.mockito.kotlin.mock
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyNoMoreInteractions
@MediumTest
@RunWith(AndroidJUnit4::class)
@@ -83,41 +77,4 @@
verify(onClick2, times(1)).invoke(any())
}
}
-
- @OptIn(ExperimentalFoundationApi::class)
- @Test
- fun onhover_callback() {
- val onHover: (Int?) -> Unit = mock()
- val onClick: (Int) -> Unit = mock()
- rule.setContent {
- ClickableText(
- modifier = Modifier.testTag("clickableText"),
- text = AnnotatedString("android"),
- onHover = onHover,
- onClick = onClick,
- )
- }
-
- rule.onNodeWithTag("clickableText").performMouseInput {
- moveTo(Offset(-1f, -1f), 0) // outside bounds
- moveTo(Offset(1f, 1f), 0) // inside bounds
- moveTo(Offset(-1f, -1f), 0) // outside bounds again
- moveTo(Offset(1f, 1f), 0) // inside bounds again
- moveTo(Offset(1f, 2f), 0) // move but stay on the same character
- moveTo(Offset(50f, 1f), 0) // move to different character
- }
-
- rule.runOnIdle {
- onHover.inOrder {
- verify().invoke(0) // first enter
- verify().invoke(null) // first exit
- verify().invoke(0) // second enter
- verify().invoke(argWhere { it > 0 }) // move to different character
- verifyNoMoreInteractions()
- }
- // Using `verifyZeroInteractions` here inexplicably results in a build failure, but
- // `verifyNoMoreInteractions` builds and is literally calling the same API.
- verifyNoMoreInteractions(onClick)
- }
- }
}
diff --git a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/input/internal/selection/gesture/TextFieldScrolledSelectionGestureTest.kt b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/input/internal/selection/gesture/TextFieldScrolledSelectionGestureTest.kt
index f15891f..9c72258 100644
--- a/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/input/internal/selection/gesture/TextFieldScrolledSelectionGestureTest.kt
+++ b/compose/foundation/foundation/src/androidInstrumentedTest/kotlin/androidx/compose/foundation/text/input/internal/selection/gesture/TextFieldScrolledSelectionGestureTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal.selection.gesture
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.isPlatformMagnifierSupported
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
@@ -82,7 +81,6 @@
*
* Regression test for b/314385218.
*/
-@ExperimentalFoundationApi
@MediumTest
@RunWith(AndroidJUnit4::class)
class TextFieldScrolledSelectionGestureTest : FocusedWindowTest {
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt
index 9eb4c07..5207e43 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt
@@ -60,7 +60,6 @@
import kotlin.math.roundToInt
@Composable
-@OptIn(ExperimentalFoundationApi::class)
internal actual fun rememberOverscrollEffect(): OverscrollEffect {
val context = LocalContext.current
val config = LocalOverscrollConfiguration.current
@@ -318,7 +317,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class DrawGlowOverscrollModifier(
private val overscrollEffect: AndroidEdgeEffectOverscrollEffect,
private val edgeEffectWrapper: EdgeEffectWrapper,
@@ -421,7 +419,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class AndroidEdgeEffectOverscrollEffect(
context: Context,
overscrollConfig: OverscrollConfiguration
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/BasicTooltip.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/BasicTooltip.android.kt
index cf1b139..72e2f66 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/BasicTooltip.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/BasicTooltip.android.kt
@@ -63,7 +63,6 @@
* @param content the composable that the tooltip will anchor to.
*/
@Composable
-@ExperimentalFoundationApi
actual fun BasicTooltipBox(
positionProvider: PopupPositionProvider,
tooltip: @Composable () -> Unit,
@@ -97,7 +96,6 @@
}
@Composable
-@OptIn(ExperimentalFoundationApi::class)
private fun WrappedAnchor(
enableUserInput: Boolean,
state: BasicTooltipState,
@@ -117,7 +115,6 @@
}
@Composable
-@OptIn(ExperimentalFoundationApi::class)
private fun TooltipPopup(
positionProvider: PopupPositionProvider,
state: BasicTooltipState,
@@ -147,7 +144,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.handleGestures(enabled: Boolean, state: BasicTooltipState): Modifier =
if (enabled) {
this.pointerInput(state) {
@@ -204,7 +200,6 @@
}
} else this
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.anchorSemantics(
label: String,
enabled: Boolean,
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/OverscrollConfiguration.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/OverscrollConfiguration.android.kt
index 6d47157..d3603fe 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/OverscrollConfiguration.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/OverscrollConfiguration.android.kt
@@ -32,7 +32,6 @@
* @param drawPadding the amount of padding to apply from scrollable container bounds to the effect
* before drawing it, if the platform effect is a glow effect, otherwise ignored.
*/
-@ExperimentalFoundationApi
@Stable
class OverscrollConfiguration(
val glowColor: Color = Color(0xff666666), // taken from EdgeEffect.java defaults
@@ -68,7 +67,5 @@
* Note: this is experimental since the underlying [OverscrollConfiguration] is also experimental.
*/
@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
-@ExperimentalFoundationApi
-@get:ExperimentalFoundationApi
val LocalOverscrollConfiguration =
compositionLocalOf<OverscrollConfiguration?> { OverscrollConfiguration() }
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/content/MediaType.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/content/MediaType.android.kt
index c90cb09..d485bdff 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/content/MediaType.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/content/MediaType.android.kt
@@ -16,14 +16,11 @@
package androidx.compose.foundation.content
-import androidx.compose.foundation.ExperimentalFoundationApi
-
/**
* Definition of common MediaTypes on the Android platform.
*
* @param representation MimeType string that conforms to RFC 2045.
*/
-@ExperimentalFoundationApi
actual class MediaType actual constructor(actual val representation: String) {
actual companion object {
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/draganddrop/AndroidDragAndDropSource.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/draganddrop/AndroidDragAndDropSource.android.kt
index edfc27a..9871638 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/draganddrop/AndroidDragAndDropSource.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/draganddrop/AndroidDragAndDropSource.android.kt
@@ -17,7 +17,6 @@
package androidx.compose.foundation.draganddrop
import android.graphics.Picture
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.CacheDrawModifierNode
import androidx.compose.ui.draw.CacheDrawScope
@@ -42,14 +41,12 @@
* [PointerInputScope] to detect the drag gesture, after which a drag and drop gesture can be
* started with [DragAndDropSourceScope.startTransfer].
*/
-@ExperimentalFoundationApi
fun Modifier.dragAndDropSource(block: suspend DragAndDropSourceScope.() -> Unit): Modifier =
this then
DragAndDropSourceWithDefaultShadowElement(
dragAndDropSourceHandler = block,
)
-@ExperimentalFoundationApi
private class DragAndDropSourceWithDefaultShadowElement(
/** @see Modifier.dragAndDropSource */
val dragAndDropSourceHandler: suspend DragAndDropSourceScope.() -> Unit
@@ -82,7 +79,6 @@
}
}
-@ExperimentalFoundationApi
private class DragSourceNodeWithDefaultPainter(
var dragAndDropSourceHandler: suspend DragAndDropSourceScope.() -> Unit
) : DelegatingNode() {
@@ -101,7 +97,6 @@
}
}
-@ExperimentalFoundationApi
private class CacheDrawScopeDragShadowCallback {
private var cachedPicture: Picture? = null
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.android.kt
index 3157cd3..4dbbe5e 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.android.kt
@@ -19,9 +19,7 @@
import android.annotation.SuppressLint
import android.os.Parcel
import android.os.Parcelable
-import androidx.compose.foundation.ExperimentalFoundationApi
-@ExperimentalFoundationApi
actual fun getDefaultLazyLayoutKey(index: Int): Any = DefaultLazyKey(index)
@SuppressLint("BanParcelableUsage")
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.android.kt
index b0f2d0c..074a117d 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.android.kt
@@ -20,7 +20,6 @@
import android.view.Choreographer
import android.view.Display
import android.view.View
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.RememberObserver
import androidx.compose.runtime.collection.mutableVectorOf
@@ -28,7 +27,6 @@
import androidx.compose.ui.platform.LocalView
import kotlin.math.max
-@ExperimentalFoundationApi
@Composable
internal actual fun rememberDefaultPrefetchScheduler(): PrefetchScheduler {
return if (RobolectricImpl != null) {
@@ -77,7 +75,6 @@
* precompose on the different thread this issue is also not so critical given that we don't need
* to calculate the deadline. Tracking bug: 187393922
*/
-@ExperimentalFoundationApi
internal class AndroidPrefetchScheduler(private val view: View) :
PrefetchScheduler, RememberObserver, Runnable, Choreographer.FrameCallback {
@@ -205,7 +202,6 @@
}
}
-@ExperimentalFoundationApi
private val RobolectricImpl =
if (Build.FINGERPRINT.lowercase() == "robolectric") {
object : PrefetchScheduler {
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.android.kt
index bb5f6c1..07d110e 100644
--- a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.android.kt
+++ b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.android.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.content.MediaType
import androidx.compose.ui.draganddrop.DragAndDropEvent
import androidx.compose.ui.draganddrop.DragAndDropModifierNode
@@ -28,7 +27,6 @@
import androidx.compose.ui.platform.toClipEntry
import androidx.compose.ui.platform.toClipMetadata
-@OptIn(ExperimentalFoundationApi::class)
internal actual fun textFieldDragAndDropNode(
hintMediaTypes: () -> Set<MediaType>,
onDrop: (clipEntry: ClipEntry, clipMetadata: ClipMetadata) -> Boolean,
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/DraggableAnchorsTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/DraggableAnchorsTest.kt
index 8f12d22..73ac5ed 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/DraggableAnchorsTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/DraggableAnchorsTest.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.gestures
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.TestValue.A
import androidx.compose.foundation.gestures.TestValue.B
import androidx.compose.foundation.gestures.TestValue.C
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/UpdatableAnimationStateTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/UpdatableAnimationStateTest.kt
index b17cf86..47b76b9 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/UpdatableAnimationStateTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/gestures/UpdatableAnimationStateTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.MonotonicFrameClock
import androidx.compose.ui.MotionDurationScale
import com.google.common.truth.Truth.assertThat
@@ -32,7 +31,6 @@
private val frameClock = TestFrameClock()
- @OptIn(ExperimentalFoundationApi::class)
private val state = UpdatableAnimationState(BringIntoViewSpec.DefaultScrollAnimationSpec)
@Test
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/lazy/MutableIntervalListTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/lazy/MutableIntervalListTest.kt
index 6ea91d4..8cb2f3d 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/lazy/MutableIntervalListTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/lazy/MutableIntervalListTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.IntervalList
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import com.google.common.truth.Truth.assertThat
@@ -25,7 +24,6 @@
import org.junit.runners.JUnit4
@RunWith(JUnit4::class)
-@OptIn(ExperimentalFoundationApi::class)
class MutableIntervalListTest {
private val intervalList = MutableIntervalList<Int>()
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
index f8da756..5fb12b2 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/TextFieldBringIntoViewTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Rect
@@ -45,7 +44,7 @@
import org.mockito.kotlin.verifyBlocking
import org.mockito.kotlin.whenever
-@OptIn(InternalFoundationTextApi::class, ExperimentalFoundationApi::class)
+@OptIn(InternalFoundationTextApi::class)
@RunWith(JUnit4::class)
class TextFieldBringIntoViewTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/AllCapsTransformationTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/AllCapsTransformationTest.kt
index a1ca76f..8d316a2 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/AllCapsTransformationTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/AllCapsTransformationTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.intl.Locale
import com.google.common.truth.Truth.assertThat
@@ -24,7 +23,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class AllCapsTransformationTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/TextFieldCharSequenceTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/TextFieldCharSequenceTest.kt
index 2ab7d18..67257ce 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/TextFieldCharSequenceTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/TextFieldCharSequenceTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.saveable.SaverScope
import androidx.compose.ui.text.TextRange
import com.google.common.truth.Truth.assertThat
@@ -24,7 +23,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class TextFieldCharSequenceTest {
private val defaultSaverScope = SaverScope { true }
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/CodepointTransformationTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/CodepointTransformationTest.kt
index 18d86bb..6a10dc1 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/CodepointTransformationTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/CodepointTransformationTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.TextFieldCharSequence
import androidx.compose.ui.text.TextRange
import com.google.common.truth.Truth.assertThat
@@ -26,7 +25,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class CodepointTransformationTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TextFieldStateInternalBufferTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TextFieldStateInternalBufferTest.kt
index 0e3b8e4..9d70dee 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TextFieldStateInternalBufferTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TextFieldStateInternalBufferTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.InputTransformation
import androidx.compose.foundation.text.input.TextFieldBuffer
import androidx.compose.foundation.text.input.TextFieldCharSequence
@@ -28,7 +27,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class TextFieldStateInternalBufferTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/ToCharArrayTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/ToCharArrayTest.kt
index fe191c7..9867902 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/ToCharArrayTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/ToCharArrayTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.TextFieldCharSequence
import com.google.common.truth.Truth.assertThat
import kotlin.test.assertFails
@@ -24,7 +23,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class ToCharArrayTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextFieldStateTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextFieldStateTest.kt
index 4acbd26..1d94668 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextFieldStateTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextFieldStateTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.OutputTransformation
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.delete
@@ -27,7 +26,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class TransformedTextFieldStateTest {
diff --git a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextSelectionMovementTest.kt b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextSelectionMovementTest.kt
index be1cb50..cdb98df 100644
--- a/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextSelectionMovementTest.kt
+++ b/compose/foundation/foundation/src/androidUnitTest/kotlin/androidx/compose/foundation/text/input/internal/TransformedTextSelectionMovementTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.OutputTransformation
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.delete
@@ -28,7 +27,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@OptIn(ExperimentalFoundationApi::class)
@RunWith(JUnit4::class)
class TransformedTextSelectionMovementTest {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicTooltip.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicTooltip.kt
index 63da5c3..4caef00 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicTooltip.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/BasicTooltip.kt
@@ -49,7 +49,6 @@
* @param content the composable that the tooltip will anchor to.
*/
@Composable
-@ExperimentalFoundationApi
expect fun BasicTooltipBox(
positionProvider: PopupPositionProvider,
tooltip: @Composable () -> Unit,
@@ -73,7 +72,6 @@
* the mutator mutex, only one will be shown on the screen at any time.
*/
@Composable
-@ExperimentalFoundationApi
fun rememberBasicTooltipState(
initialIsVisible: Boolean = false,
isPersistent: Boolean = true,
@@ -100,7 +98,6 @@
* the mutator mutex, only one will be shown on the screen at any time.
*/
@Stable
-@ExperimentalFoundationApi
fun BasicTooltipState(
initialIsVisible: Boolean = false,
isPersistent: Boolean = true,
@@ -113,7 +110,6 @@
)
@Stable
-@OptIn(ExperimentalFoundationApi::class)
private class BasicTooltipStateImpl(
initialIsVisible: Boolean,
override val isPersistent: Boolean,
@@ -173,7 +169,6 @@
* its own [BasicTooltipState].
*/
@Stable
-@ExperimentalFoundationApi
interface BasicTooltipState {
/** [Boolean] that indicates if the tooltip is currently being shown or not. */
val isVisible: Boolean
@@ -205,7 +200,6 @@
}
/** BasicTooltip defaults that contain default values for tooltips created. */
-@ExperimentalFoundationApi
object BasicTooltipDefaults {
/** The global/default [MutatorMutex] used to sync Tooltips. */
val GlobalMutatorMutex: MutatorMutex = MutatorMutex()
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
index ff548e5..983a7b8 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
@@ -235,7 +235,6 @@
* Note: This API is experimental and is awaiting a rework. combinedClickable handles touch based
* input quite well but provides subpar functionality for other input types.
*/
-@ExperimentalFoundationApi
fun Modifier.combinedClickable(
enabled: Boolean = true,
onClickLabel: String? = null,
@@ -333,7 +332,6 @@
* Note: This API is experimental and is awaiting a rework. combinedClickable handles touch based
* input quite well but provides subpar functionality for other input types.
*/
-@ExperimentalFoundationApi
fun Modifier.combinedClickable(
interactionSource: MutableInteractionSource?,
indication: Indication?,
@@ -642,7 +640,6 @@
* Note: This API is experimental and is awaiting a rework. combinedClickable handles touch based
* input quite well but provides subpar functionality for other input types.
*/
-@ExperimentalFoundationApi
fun CombinedClickableNode(
onClick: () -> Unit,
onLongClickLabel: String?,
@@ -673,7 +670,6 @@
* Note: This API is experimental and is temporarily being exposed to enable performance analysis,
* you should use [combinedClickable] instead for the majority of use cases.
*/
-@ExperimentalFoundationApi
sealed interface CombinedClickableNode : PointerInputModifierNode {
/**
* Updates this node with new values, and resets any invalidated state accordingly.
@@ -709,7 +705,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
private class CombinedClickableNodeImpl(
onClick: () -> Unit,
private var onLongClickLabel: String?,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/FocusedBounds.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/FocusedBounds.kt
index 643dff4..492a5d1 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/FocusedBounds.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/FocusedBounds.kt
@@ -35,7 +35,6 @@
* Note that there may be some cases where the focused bounds change but the callback is _not_
* invoked, but the last [LayoutCoordinates] will always return the most up-to-date bounds.
*/
-@ExperimentalFoundationApi
fun Modifier.onFocusedBoundsChanged(onPositioned: (LayoutCoordinates?) -> Unit): Modifier =
this then FocusedBoundsObserverElement(onPositioned)
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Overscroll.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Overscroll.kt
index abcb738..f08ba7d 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Overscroll.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Overscroll.kt
@@ -50,7 +50,6 @@
*
* @sample androidx.compose.foundation.samples.OverscrollSample
*/
-@ExperimentalFoundationApi
@Stable
interface OverscrollEffect {
/**
@@ -142,15 +141,11 @@
* @sample androidx.compose.foundation.samples.OverscrollSample
* @param overscrollEffect the [OverscrollEffect] to render
*/
-@ExperimentalFoundationApi
fun Modifier.overscroll(overscrollEffect: OverscrollEffect): Modifier =
this.then(overscrollEffect.effectModifier)
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-internal expect fun rememberOverscrollEffect(): OverscrollEffect
+@Composable internal expect fun rememberOverscrollEffect(): OverscrollEffect
-@OptIn(ExperimentalFoundationApi::class)
internal object NoOpOverscrollEffect : OverscrollEffect {
override fun applyToScroll(
delta: Offset,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Scroll.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Scroll.kt
index 0b5b1a5..5aacedf 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Scroll.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Scroll.kt
@@ -253,7 +253,6 @@
isVertical = false
)
-@OptIn(ExperimentalFoundationApi::class)
private fun Modifier.scroll(
state: ScrollState,
reverseScrolling: Boolean,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/ScrollingContainer.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/ScrollingContainer.kt
index 62bdbe0..f0f3bbf 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/ScrollingContainer.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/ScrollingContainer.kt
@@ -26,7 +26,6 @@
// TODO b/316559454 to remove @Composable from it and make it public
/** Scrolling related information to transform a layout into a "Scrollable Container" */
-@ExperimentalFoundationApi
internal fun Modifier.scrollingContainer(
state: ScrollableState,
orientation: Orientation,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropSource.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropSource.kt
index a215dc0..3a08e9e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropSource.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropSource.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.draganddrop
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draganddrop.DragAndDropModifierNode
import androidx.compose.ui.draganddrop.DragAndDropTransferData
@@ -34,7 +33,6 @@
* A scope that allows for the detection of the start of a drag and drop gesture, and subsequently
* starting a drag and drop session.
*/
-@ExperimentalFoundationApi
interface DragAndDropSourceScope : PointerInputScope {
/**
* Starts a drag and drop session with [transferData] as the data to be transferred on gesture
@@ -56,7 +54,6 @@
* [PointerInputScope] to detect the drag gesture, after which a drag and drop gesture can be
* started with [DragAndDropSourceScope.startTransfer].
*/
-@ExperimentalFoundationApi
fun Modifier.dragAndDropSource(
drawDragDecoration: DrawScope.() -> Unit,
block: suspend DragAndDropSourceScope.() -> Unit
@@ -67,7 +64,6 @@
dragAndDropSourceHandler = block,
)
-@ExperimentalFoundationApi
private data class DragAndDropSourceElement(
/** @see Modifier.dragAndDropSource */
val drawDragDecoration: DrawScope.() -> Unit,
@@ -93,7 +89,6 @@
}
}
-@ExperimentalFoundationApi
internal class DragAndDropSourceNode(
var drawDragDecoration: DrawScope.() -> Unit,
var dragAndDropSourceHandler: suspend DragAndDropSourceScope.() -> Unit
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt
index ff398f1..de3a61b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/draganddrop/DragAndDropTarget.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.draganddrop
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draganddrop.DragAndDropEvent
import androidx.compose.ui.draganddrop.DragAndDropModifierNode
@@ -41,7 +40,6 @@
*
* @see [DragAndDropModifierNode.acceptDragAndDropTransfer]
*/
-@ExperimentalFoundationApi
fun Modifier.dragAndDropTarget(
shouldStartDragAndDrop: (startEvent: DragAndDropEvent) -> Boolean,
target: DragAndDropTarget,
@@ -52,7 +50,6 @@
shouldStartDragAndDrop = shouldStartDragAndDrop,
)
-@ExperimentalFoundationApi
private class DropTargetElement(
val shouldStartDragAndDrop: (event: DragAndDropEvent) -> Boolean,
val target: DragAndDropTarget,
@@ -87,7 +84,6 @@
}
}
-@ExperimentalFoundationApi
private class DragAndDropTargetNode(
private var shouldStartDragAndDrop: (event: DragAndDropEvent) -> Boolean,
private var target: DragAndDropTarget
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt
index 0ebc2d1..c036c6d 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/AnchoredDraggable.kt
@@ -29,7 +29,6 @@
import androidx.compose.animation.core.exponentialDecay
import androidx.compose.animation.core.generateDecayAnimationSpec
import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.MutatePriority
import androidx.compose.foundation.MutatorMutex
import androidx.compose.foundation.OverscrollEffect
@@ -103,7 +102,6 @@
* default (if passing in null), this will snap to the closest anchor considering the velocity
* thresholds and positional thresholds. See [AnchoredDraggableDefaults.flingBehavior].
*/
-@OptIn(ExperimentalFoundationApi::class)
fun <T> Modifier.anchoredDraggable(
state: AnchoredDraggableState<T>,
reverseDirection: Boolean,
@@ -149,7 +147,6 @@
* default (if passing in null), this will snap to the closest anchor considering the velocity
* thresholds and positional thresholds. See [AnchoredDraggableDefaults.flingBehavior].
*/
-@OptIn(ExperimentalFoundationApi::class)
fun <T> Modifier.anchoredDraggable(
state: AnchoredDraggableState<T>,
orientation: Orientation,
@@ -200,10 +197,7 @@
* @param flingBehavior Optionally configure how the anchored draggable performs the fling. By
* default (if passing in null), this will snap to the closest anchor considering the velocity
* thresholds and positional thresholds. See [AnchoredDraggableDefaults.flingBehavior].
- *
- * This API is experimental as it uses [OverscrollEffect], which is experimental.
*/
-@ExperimentalFoundationApi
fun <T> Modifier.anchoredDraggable(
state: AnchoredDraggableState<T>,
reverseDirection: Boolean,
@@ -253,10 +247,7 @@
* @param flingBehavior Optionally configure how the anchored draggable performs the fling. By
* default (if passing in null), this will snap to the closest anchor considering the velocity
* thresholds and positional thresholds. See [AnchoredDraggableDefaults.flingBehavior].
- *
- * This API is experimental as it uses [OverscrollEffect], which is experimental.
*/
-@ExperimentalFoundationApi
fun <T> Modifier.anchoredDraggable(
state: AnchoredDraggableState<T>,
orientation: Orientation,
@@ -278,7 +269,6 @@
flingBehavior = flingBehavior
)
-@OptIn(ExperimentalFoundationApi::class)
private class AnchoredDraggableElement<T>(
private val state: AnchoredDraggableState<T>,
private val orientation: Orientation,
@@ -356,7 +346,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class AnchoredDraggableNode<T>(
private var state: AnchoredDraggableState<T>,
private var orientation: Orientation,
@@ -550,7 +539,6 @@
*
* See the DraggableAnchors factory method to construct drag anchors using a default implementation.
*/
-@ExperimentalFoundationApi
interface DraggableAnchors<T> {
/**
@@ -608,7 +596,6 @@
* corresponding [Float] positions. This [DraggableAnchorsConfig] is used to construct an immutable
* [DraggableAnchors] instance later on.
*/
-@ExperimentalFoundationApi
class DraggableAnchorsConfig<T> {
internal val anchors = MutableObjectFloatMap<T>()
@@ -631,7 +618,6 @@
* @return A new [DraggableAnchors] instance with the anchor positions set by the `builder`
* function.
*/
-@ExperimentalFoundationApi
fun <T : Any> DraggableAnchors(builder: DraggableAnchorsConfig<T>.() -> Unit): DraggableAnchors<T> =
MapDraggableAnchors(DraggableAnchorsConfig<T>().apply(builder).anchors)
@@ -671,7 +657,6 @@
* reached.
* @param confirmValueChange Optional callback invoked to confirm or veto a pending state change.
*/
-@ExperimentalFoundationApi
@Deprecated(ConfigurationMovedToModifier, level = DeprecationLevel.WARNING)
fun <T> AnchoredDraggableState(
initialValue: T,
@@ -709,7 +694,6 @@
* exceed in order to animate to the next state, even if the [positionalThreshold] has not been
* reached.
*/
-@ExperimentalFoundationApi
@Deprecated(ConfigurationMovedToModifier, level = DeprecationLevel.WARNING)
fun <T> AnchoredDraggableState(
initialValue: T,
@@ -744,7 +728,6 @@
* @param initialValue The initial value of the state.
* @param confirmValueChange Optional callback invoked to confirm or veto a pending state change.
*/
-@OptIn(ExperimentalFoundationApi::class) // DraggableAnchors is still experimental
@Stable
class AnchoredDraggableState<T>(
initialValue: T,
@@ -1195,7 +1178,6 @@
)
/** The default [Saver] implementation for [AnchoredDraggableState]. */
- @ExperimentalFoundationApi
@Deprecated(ConfigurationMovedToModifier, level = DeprecationLevel.WARNING)
@Suppress("DEPRECATION")
fun <T : Any> Saver(
@@ -1230,7 +1212,6 @@
* @throws CancellationException if the interaction interrupted by another interaction like a
* gesture interaction or another programmatic interaction like a [animateTo] or [snapTo] call.
*/
-@OptIn(ExperimentalFoundationApi::class)
suspend fun <T> AnchoredDraggableState<T>.snapTo(targetValue: T) {
anchoredDrag(targetValue = targetValue) { anchors, latestTarget ->
val targetOffset = anchors.positionOf(latestTarget)
@@ -1238,7 +1219,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private suspend fun <T> AnchoredDraggableState<T>.animateTo(
velocity: Float,
anchoredDragScope: AnchoredDragScope,
@@ -1273,7 +1253,6 @@
* @throws CancellationException if the interaction interrupted by another interaction like a
* gesture interaction or another programmatic interaction like a [animateTo] or [snapTo] call.
*/
-@OptIn(ExperimentalFoundationApi::class)
suspend fun <T> AnchoredDraggableState<T>.animateTo(
targetValue: T,
animationSpec: AnimationSpec<Float> =
@@ -1305,7 +1284,6 @@
* @throws CancellationException if the interaction interrupted bt another interaction like a
* gesture interaction or another programmatic interaction like [animateTo] or [snapTo] call.
*/
-@OptIn(ExperimentalFoundationApi::class)
suspend fun <T> AnchoredDraggableState<T>.animateToWithDecay(
targetValue: T,
velocity: Float,
@@ -1388,7 +1366,6 @@
*
* @return The suggested target anchor
*/
-@ExperimentalFoundationApi
private fun <T> DraggableAnchors<T>.computeTarget(
currentOffset: Float,
currentValue: T,
@@ -1507,7 +1484,6 @@
private fun <T> emptyDraggableAnchors() = MapDraggableAnchors<T>(MutableObjectFloatMap())
-@OptIn(ExperimentalFoundationApi::class)
private class MapDraggableAnchors<T>(private val anchors: ObjectFloatMap<T>) : DraggableAnchors<T> {
override fun positionOf(value: T): Float = anchors.getOrDefault(value, Float.NaN)
@@ -1623,7 +1599,6 @@
)
)
-@OptIn(ExperimentalFoundationApi::class)
private fun <T> AnchoredDraggableLayoutInfoProvider(
state: AnchoredDraggableState<T>,
positionalThreshold: (totalDistance: Float) -> Float,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.kt
index 84ae573..bf63568 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.kt
@@ -18,7 +18,6 @@
import androidx.compose.animation.core.AnimationSpec
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.Stable
import androidx.compose.ui.Modifier
@@ -29,8 +28,6 @@
* [LocalBringIntoViewSpec] has a platform defined default behavior.
*/
@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
-@get:ExperimentalFoundationApi
-@ExperimentalFoundationApi
expect val LocalBringIntoViewSpec: ProvidableCompositionLocal<BringIntoViewSpec>
/**
@@ -42,7 +39,6 @@
*
* @sample androidx.compose.foundation.samples.FocusScrollingInLazyRowSample
*/
-@ExperimentalFoundationApi
@Stable
interface BringIntoViewSpec {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
index 8570920..f530a7e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Scrollable.kt
@@ -22,11 +22,9 @@
import androidx.compose.animation.core.animateDecay
import androidx.compose.animation.rememberSplineBasedDecay
import androidx.compose.animation.splineBasedDecay
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.FocusedBoundsObserverNode
import androidx.compose.foundation.MutatePriority
import androidx.compose.foundation.OverscrollEffect
-import androidx.compose.foundation.gestures.BringIntoViewSpec.Companion.DefaultBringIntoViewSpec
import androidx.compose.foundation.gestures.Orientation.Horizontal
import androidx.compose.foundation.gestures.Orientation.Vertical
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -108,7 +106,6 @@
* this scrollable is being dragged.
*/
@Stable
-@OptIn(ExperimentalFoundationApi::class)
fun Modifier.scrollable(
state: ScrollableState,
orientation: Orientation,
@@ -164,7 +161,6 @@
* [overscrollEffect] and [bringIntoViewSpec].
*/
@Stable
-@ExperimentalFoundationApi
fun Modifier.scrollable(
state: ScrollableState,
orientation: Orientation,
@@ -187,7 +183,6 @@
bringIntoViewSpec
)
-@OptIn(ExperimentalFoundationApi::class)
private class ScrollableElement(
val state: ScrollableState,
val orientation: Orientation,
@@ -266,7 +261,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class ScrollableNode(
state: ScrollableState,
private var overscrollEffect: OverscrollEffect?,
@@ -550,7 +544,6 @@
* effects.
*/
@Composable
- @ExperimentalFoundationApi
fun overscrollEffect(): OverscrollEffect {
return rememberOverscrollEffect()
}
@@ -579,21 +572,6 @@
}
return reverseDirection
}
-
- /**
- * A default implementation for [BringIntoViewSpec] that brings a child into view using the
- * least amount of effort.
- */
- @Deprecated(
- "This has been replaced by composition locals LocalBringIntoViewSpec",
- replaceWith =
- ReplaceWith(
- "LocalBringIntoView.current",
- "androidx.compose.foundation.gestures.LocalBringIntoViewSpec"
- )
- )
- @ExperimentalFoundationApi
- fun bringIntoViewSpec(): BringIntoViewSpec = DefaultBringIntoViewSpec
}
internal interface ScrollConfig {
@@ -610,7 +588,6 @@
* Holds all scrolling related logic: controls nested scrolling, flinging, overscroll and delta
* dispatching.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class ScrollingLogic(
private var scrollableState: ScrollableState,
private var overscrollEffect: OverscrollEffect?,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Transformable.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Transformable.kt
index 2b591c4..f05f42e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Transformable.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/Transformable.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.MutatePriority
import androidx.compose.foundation.gestures.TransformEvent.TransformDelta
import androidx.compose.foundation.gestures.TransformEvent.TransformStarted
@@ -58,7 +57,6 @@
* detected.
* @param enabled whether zooming by gestures is enabled or not
*/
-@OptIn(ExperimentalFoundationApi::class)
fun Modifier.transformable(
state: TransformableState,
lockRotationOnZoomPan: Boolean = false,
@@ -87,7 +85,6 @@
* detected.
* @param enabled whether zooming by gestures is enabled or not
*/
-@ExperimentalFoundationApi
fun Modifier.transformable(
state: TransformableState,
canPan: (Offset) -> Boolean,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/PagerSnapLayoutInfoProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/PagerSnapLayoutInfoProvider.kt
index 4900cf0..deac658 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/PagerSnapLayoutInfoProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/PagerSnapLayoutInfoProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures.snapping
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.pager.PagerDebugConfig
import androidx.compose.foundation.pager.PagerLayoutInfo
@@ -220,7 +219,6 @@
* Given two possible bounds that this Pager can settle in represented by [lowerBoundOffset] and
* [upperBoundOffset], this function will decide which one of them it will settle to.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal fun calculateFinalSnappingBound(
pagerState: PagerState,
layoutDirection: LayoutDirection,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehavior.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehavior.kt
index 0dfb635..134e790 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehavior.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/gestures/snapping/SnapFlingBehavior.kt
@@ -29,7 +29,6 @@
import androidx.compose.animation.core.copy
import androidx.compose.animation.core.spring
import androidx.compose.animation.rememberSplineBasedDecay
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.DefaultScrollMotionDurationScale
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.ScrollScope
@@ -63,8 +62,6 @@
* velocity is large enough. Large enough means large enough to naturally decay.
* @param snapAnimationSpec The animation spec used to finally snap to the correct bound.
*/
-@OptIn(ExperimentalFoundationApi::class)
-@Suppress("Deprecation")
fun snapFlingBehavior(
snapLayoutInfoProvider: SnapLayoutInfoProvider,
decayAnimationSpec: DecayAnimationSpec<Float>,
@@ -73,12 +70,7 @@
return SnapFlingBehavior(snapLayoutInfoProvider, decayAnimationSpec, snapAnimationSpec)
}
-@Deprecated(
- "Please use the snapFlingBehavior function",
- replaceWith = ReplaceWith("androidx.compose.foundation.gestures.snapping.snapFlingBehavior")
-)
-@ExperimentalFoundationApi
-class SnapFlingBehavior(
+internal class SnapFlingBehavior(
private val snapLayoutInfoProvider: SnapLayoutInfoProvider,
private val decayAnimationSpec: DecayAnimationSpec<Float>,
private val snapAnimationSpec: AnimationSpec<Float>
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyDsl.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyDsl.kt
index efa21df..4dd7d8fb3 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyDsl.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyDsl.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.FlingBehavior
import androidx.compose.foundation.gestures.ScrollableDefaults
import androidx.compose.foundation.internal.JvmDefaultWithCompatibility
@@ -113,7 +112,6 @@
* Note: More investigations needed to make sure sticky headers API is suitable for various more
* generic usecases, e.g. in grids. This API is experimental until the answer is found.
*/
- @ExperimentalFoundationApi
fun stickyHeader(
key: Any? = null,
contentType: Any? = null,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyItemScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyItemScope.kt
index 62531cd..c17380b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyItemScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyItemScope.kt
@@ -21,7 +21,6 @@
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.VisibilityThreshold
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.internal.JvmDefaultWithCompatibility
import androidx.compose.runtime.Stable
import androidx.compose.ui.Modifier
@@ -100,29 +99,4 @@
),
fadeOutSpec: FiniteAnimationSpec<Float>? = spring(stiffness = Spring.StiffnessMediumLow),
): Modifier = this
-
- /**
- * This modifier animates the item placement within the Lazy list.
- *
- * When you provide a key via [LazyListScope.item]/[LazyListScope.items] this modifier will
- * enable item reordering animations. Aside from item reordering all other position changes
- * caused by events like arrangement or alignment changes will also be animated.
- *
- * @param animationSpec a finite animation that will be used to animate the item placement.
- */
- @Deprecated(
- "Use Modifier.animateItem() instead",
- ReplaceWith(
- "Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null, " +
- "placementSpec = animationSpec)"
- )
- )
- @ExperimentalFoundationApi
- fun Modifier.animateItemPlacement(
- animationSpec: FiniteAnimationSpec<IntOffset> =
- spring(
- stiffness = Spring.StiffnessMediumLow,
- visibilityThreshold = IntOffset.VisibilityThreshold
- )
- ): Modifier = animateItem(fadeInSpec = null, placementSpec = animationSpec, fadeOutSpec = null)
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListAnimateScrollScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListAnimateScrollScope.kt
index dbf0b44..b99969b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListAnimateScrollScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListAnimateScrollScope.kt
@@ -16,13 +16,11 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.foundation.lazy.layout.LazyLayoutAnimateScrollScope
import androidx.compose.ui.util.fastFirstOrNull
import androidx.compose.ui.util.fastSumBy
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyListAnimateScrollScope(private val state: LazyListState) :
LazyLayoutAnimateScrollScope {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt
index 4eb7470..cb509d2 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListIntervalContent.kt
@@ -16,12 +16,10 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import androidx.compose.runtime.Composable
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyListIntervalContent(
content: LazyListScope.() -> Unit,
) : LazyLayoutIntervalContent<LazyListInterval>(), LazyListScope {
@@ -58,7 +56,6 @@
)
}
- @ExperimentalFoundationApi
override fun stickyHeader(
key: Any?,
contentType: Any?,
@@ -71,7 +68,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyListInterval(
override val key: ((index: Int) -> Any)?,
override val type: ((index: Int) -> Any?),
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt
index 7555c72..6f0bbbe 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutPinnableItem
@@ -27,7 +26,6 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
-@ExperimentalFoundationApi
internal interface LazyListItemProvider : LazyLayoutItemProvider {
val keyIndexMap: LazyLayoutKeyIndexMap
/** The list of indexes of the sticky header items */
@@ -36,7 +34,6 @@
val itemScope: LazyItemScopeImpl
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberLazyListItemProviderLambda(
state: LazyListState,
@@ -64,7 +61,6 @@
}
}
-@ExperimentalFoundationApi
private class LazyListItemProviderImpl
constructor(
private val state: LazyListState,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItem.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItem.kt
index cabb48c..d3c64fc 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItem.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItem.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemAnimation.Companion.NotInitialized
import androidx.compose.foundation.lazy.layout.LazyLayoutItemAnimator
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasuredItem
@@ -34,7 +33,6 @@
* the user emit multiple layout nodes in the item callback.
*/
internal class LazyListMeasuredItem
-@ExperimentalFoundationApi
constructor(
override val index: Int,
private val placeables: List<Placeable>,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItemProvider.kt
index d003ff9..ce1a5d3 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasuredItemProvider
@@ -24,9 +23,7 @@
import androidx.compose.ui.unit.Constraints
/** Abstracts away the subcomposition from the measuring logic. */
-@OptIn(ExperimentalFoundationApi::class)
internal abstract class LazyListMeasuredItemProvider
-@ExperimentalFoundationApi
constructor(
constraints: Constraints,
isVertical: Boolean,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListScrollPosition.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListScrollPosition.kt
index c879312..43b1adf 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListScrollPosition.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListScrollPosition.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutNearestRangeState
import androidx.compose.foundation.lazy.layout.findIndexByKey
import androidx.compose.runtime.getValue
@@ -89,7 +88,6 @@
* were items added or removed before our current first visible item and keep this item as the
* first visible one even given that its index has been changed.
*/
- @ExperimentalFoundationApi
fun updateScrollPositionIfTheFirstItemWasMoved(
itemProvider: LazyListItemProvider,
index: Int
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListState.kt
index b8d41da..6d3a9f8 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListState.kt
@@ -601,7 +601,6 @@
* A [Saver] implementation for [LazyListState] that handles setting a custom
* [LazyListPrefetchStrategy].
*/
- @ExperimentalFoundationApi
internal fun saver(prefetchStrategy: LazyListPrefetchStrategy): Saver<LazyListState, *> =
listSaver(
save = { listOf(it.firstVisibleItemIndex, it.firstVisibleItemScrollOffset) },
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
index 6611091..57c7da8 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGrid.kt
@@ -143,7 +143,6 @@
/** lazy grid slots configuration */
internal class LazyGridSlots(val sizes: IntArray, val positions: IntArray)
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberLazyGridMeasurePolicy(
/** Items provider of the list. */
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridAnimateScrollScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridAnimateScrollScope.kt
index 39cb9a0..e952773 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridAnimateScrollScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridAnimateScrollScope.kt
@@ -16,14 +16,12 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.foundation.lazy.layout.LazyLayoutAnimateScrollScope
import androidx.compose.ui.util.fastFirstOrNull
import kotlin.math.max
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyGridAnimateScrollScope(private val state: LazyGridState) :
LazyLayoutAnimateScrollScope {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridIntervalContent.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridIntervalContent.kt
index 7c369bd..39c3218 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridIntervalContent.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridIntervalContent.kt
@@ -16,12 +16,10 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import androidx.compose.runtime.Composable
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyGridIntervalContent(content: LazyGridScope.() -> Unit) :
LazyGridScope, LazyLayoutIntervalContent<LazyGridInterval>() {
internal val spanLayoutProvider: LazyGridSpanLayoutProvider = LazyGridSpanLayoutProvider(this)
@@ -76,7 +74,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyGridInterval(
override val key: ((index: Int) -> Any)?,
val span: LazyGridItemSpanScope.(Int) -> GridItemSpan,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
index dc4ddf8..324adbb 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutPinnableItem
@@ -27,13 +26,11 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
-@ExperimentalFoundationApi
internal interface LazyGridItemProvider : LazyLayoutItemProvider {
val keyIndexMap: LazyLayoutKeyIndexMap
val spanLayoutProvider: LazyGridSpanLayoutProvider
}
-@ExperimentalFoundationApi
@Composable
internal fun rememberLazyGridItemProviderLambda(
state: LazyGridState,
@@ -59,7 +56,6 @@
}
}
-@ExperimentalFoundationApi
private class LazyGridItemProviderImpl(
private val state: LazyGridState,
private val intervalContent: LazyGridIntervalContent,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemScope.kt
index 42a4ee8..1045971 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridItemScope.kt
@@ -20,7 +20,6 @@
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.VisibilityThreshold
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Stable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.IntOffset
@@ -54,29 +53,4 @@
),
fadeOutSpec: FiniteAnimationSpec<Float>? = spring(stiffness = Spring.StiffnessMediumLow),
): Modifier
-
- /**
- * This modifier animates the item placement within the Lazy grid.
- *
- * When you provide a key via [LazyGridScope.item]/[LazyGridScope.items] this modifier will
- * enable item reordering animations. Aside from item reordering all other position changes
- * caused by events like arrangement changes will also be animated.
- *
- * @param animationSpec a finite animation that will be used to animate the item placement.
- */
- @Deprecated(
- "Use Modifier.animateItem() instead",
- ReplaceWith(
- "Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null, " +
- "placementSpec = animationSpec)"
- )
- )
- @ExperimentalFoundationApi
- fun Modifier.animateItemPlacement(
- animationSpec: FiniteAnimationSpec<IntOffset> =
- spring(
- stiffness = Spring.StiffnessMediumLow,
- visibilityThreshold = IntOffset.VisibilityThreshold
- )
- ): Modifier = animateItem(fadeInSpec = null, placementSpec = animationSpec, fadeOutSpec = null)
}
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
index 36801c5..e533ffb 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasure.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.lazy.layout.LazyLayoutItemAnimator
@@ -44,7 +43,6 @@
* Measures and calculates the positions for the currently visible items. The result is produced as
* a [LazyGridMeasureResult] which contains all the calculations.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal fun measureLazyGrid(
itemsCount: Int,
measuredLineProvider: LazyGridMeasuredLineProvider,
@@ -392,7 +390,6 @@
}
}
-@ExperimentalFoundationApi
private inline fun calculateExtraItems(
pinnedItems: List<Int>,
measuredItemProvider: LazyGridMeasuredItemProvider,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredItemProvider.kt
index ed50972..adfaebf 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridMeasuredItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasuredItemProvider
@@ -24,9 +23,7 @@
import androidx.compose.ui.unit.Constraints
/** Abstracts away the subcomposition from the measuring logic. */
-@OptIn(ExperimentalFoundationApi::class)
internal abstract class LazyGridMeasuredItemProvider
-@ExperimentalFoundationApi
constructor(
private val itemProvider: LazyGridItemProvider,
private val measureScope: LazyLayoutMeasureScope,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridScrollPosition.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridScrollPosition.kt
index bf35118..9a34965 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridScrollPosition.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridScrollPosition.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutNearestRangeState
import androidx.compose.foundation.lazy.layout.findIndexByKey
import androidx.compose.runtime.getValue
@@ -27,7 +26,6 @@
* Contains the current scroll position represented by the first visible item index and the first
* visible item scroll offset.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyGridScrollPosition(initialIndex: Int = 0, initialScrollOffset: Int = 0) {
var index by mutableIntStateOf(initialIndex)
private set
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
index ea8a645..c369ae6 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazyGridSpanLayoutProvider.kt
@@ -16,11 +16,9 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import kotlin.math.min
import kotlin.math.sqrt
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyGridSpanLayoutProvider(private val gridContent: LazyGridIntervalContent) {
class LineConfiguration(val firstItemIndex: Int, val spans: List<GridItemSpan>)
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazySemantics.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazySemantics.kt
index 7183bc7..f1c2796 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazySemantics.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/grid/LazySemantics.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.grid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.lazy.layout.LazyLayoutSemanticState
import androidx.compose.foundation.lazy.layout.estimatedLazyMaxScrollOffset
@@ -25,7 +24,6 @@
import androidx.compose.runtime.remember
import androidx.compose.ui.semantics.CollectionInfo
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberLazyGridSemanticState(
state: LazyGridState,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/IntervalList.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/IntervalList.kt
index 14e1e7d..2a5e21e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/IntervalList.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/IntervalList.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.collection.MutableVector
import androidx.compose.runtime.collection.mutableVectorOf
@@ -33,7 +32,6 @@
* Note: this class is a part of [LazyLayout] harness that allows for building custom lazy layouts.
* LazyLayout and all corresponding APIs are still under development and are subject to change.
*/
-@ExperimentalFoundationApi
sealed interface IntervalList<out T> {
/**
@@ -89,7 +87,6 @@
* Note: this class is a part of [LazyLayout] harness that allows for building custom lazy layouts.
* LazyLayout and all corresponding APIs are still under development and are subject to change.
*/
-@ExperimentalFoundationApi
class MutableIntervalList<T> : IntervalList<T> {
private val intervals = mutableVectorOf<IntervalList.Interval<T>>()
@@ -173,7 +170,6 @@
* Finds the index of the interval which contains the highest value of
* [IntervalList.Interval.startIndex] that is less than or equal to the given [itemIndex].
*/
-@ExperimentalFoundationApi
private fun <T> MutableVector<IntervalList.Interval<T>>.binarySearch(itemIndex: Int): Int {
var left = 0
var right = lastIndex
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyAnimateScroll.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyAnimateScroll.kt
index 7f223c3..6b5cefd 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyAnimateScroll.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyAnimateScroll.kt
@@ -20,7 +20,6 @@
import androidx.compose.animation.core.AnimationVector1D
import androidx.compose.animation.core.animateTo
import androidx.compose.animation.core.copy
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.dp
@@ -49,7 +48,6 @@
* A scope to allow customization of animated scroll in LazyLayouts. This scope contains all needed
* information to perform an animatedScroll in a scrollable LazyLayout.
*/
-@ExperimentalFoundationApi
internal interface LazyLayoutAnimateScrollScope {
/** The index of the first visible item in the lazy layout. */
@@ -89,12 +87,10 @@
suspend fun scroll(block: suspend ScrollScope.() -> Unit)
}
-@OptIn(ExperimentalFoundationApi::class)
internal fun LazyLayoutAnimateScrollScope.isItemVisible(index: Int): Boolean {
return index in firstVisibleItemIndex..lastVisibleItemIndex
}
-@OptIn(ExperimentalFoundationApi::class)
internal suspend fun LazyLayoutAnimateScrollScope.animateScrollToItem(
index: Int,
scrollOffset: Int,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayout.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayout.kt
index e5330a6..43e7e4c 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayout.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayout.kt
@@ -32,32 +32,6 @@
* A layout that only composes and lays out currently needed items. Can be used to build efficient
* scrollable layouts.
*
- * @param itemProvider provides all the needed info about the items which could be used to compose
- * and measure items as part of [measurePolicy].
- * @param modifier to apply on the layout
- * @param prefetchState allows to schedule items for prefetching
- * @param measurePolicy Measure policy which allows to only compose and measure needed items.
- */
-@Deprecated(
- message = "Use an overload accepting a lambda prodicing an item provider instead",
- replaceWith =
- ReplaceWith("LazyLayout({ itemProvider }, modifier, prefetchState, measurePolicy)")
-)
-@ExperimentalFoundationApi
-@Composable
-fun LazyLayout(
- itemProvider: LazyLayoutItemProvider,
- modifier: Modifier = Modifier,
- prefetchState: LazyLayoutPrefetchState? = null,
- measurePolicy: LazyLayoutMeasureScope.(Constraints) -> MeasureResult
-) {
- LazyLayout({ itemProvider }, modifier, prefetchState, measurePolicy)
-}
-
-/**
- * A layout that only composes and lays out currently needed items. Can be used to build efficient
- * scrollable layouts.
- *
* @param itemProvider lambda producing an item provider containing all the needed info about the
* items which could be used to compose and measure items as part of [measurePolicy].
* @param modifier to apply on the layout
@@ -108,7 +82,6 @@
}
}
-@ExperimentalFoundationApi
private class LazyLayoutItemReusePolicy(private val factory: LazyLayoutItemContentFactory) :
SubcomposeSlotReusePolicy {
private val countPerType = mutableMapOf<Any?, Int>()
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt
index a6ab79c..00e8670 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutBeyondBoundsState.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.util.fastForEach
import kotlin.math.min
@@ -33,7 +32,6 @@
val lastPlacedIndex: Int
}
-@OptIn(ExperimentalFoundationApi::class)
internal fun LazyLayoutItemProvider.calculateLazyLayoutPinnedIndices(
pinnedItemList: LazyLayoutPinnedItemList,
beyondBoundsInfo: LazyLayoutBeyondBoundsInfo,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutIntervalContent.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutIntervalContent.kt
index 6ae3480..d043fb7 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutIntervalContent.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutIntervalContent.kt
@@ -16,15 +16,12 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
-
/**
* Common parts backing the interval-based content of lazy layout defined through `item` DSL.
*
* Note: this class is a part of [LazyLayout] harness that allows for building custom lazy layouts.
* LazyLayout and all corresponding APIs are still under development and are subject to change.
*/
-@ExperimentalFoundationApi
abstract class LazyLayoutIntervalContent<Interval : LazyLayoutIntervalContent.Interval> {
abstract val intervals: IntervalList<Interval>
@@ -62,7 +59,6 @@
* layouts. LazyLayout and all corresponding APIs are still under development and are subject to
* change.
*/
- @ExperimentalFoundationApi
interface Interval {
/** Returns item key based on a local index for the current interval. */
val key: ((index: Int) -> Any)?
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemContentFactory.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemContentFactory.kt
index e7b1dc9..3761c12 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemContentFactory.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemContentFactory.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.ReusableContentHost
@@ -32,7 +31,6 @@
* 3) Adds state restoration on top of the composable returned by [itemProvider] with help of
* [saveableStateHolder].
*/
-@ExperimentalFoundationApi
internal class LazyLayoutItemContentFactory(
private val saveableStateHolder: SaveableStateHolder,
val itemProvider: () -> LazyLayoutItemProvider,
@@ -117,7 +115,6 @@
* Hack around skippable functions to force skip SaveableStateProvider and Item block when nothing
* changed. It allows us to skip heavy-weight composition local providers.
*/
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun SkippableItem(
itemProvider: LazyLayoutItemProvider,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemProvider.kt
index 9e1f8a4..d158768 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
@@ -29,7 +28,6 @@
* change.
*/
@Stable
-@ExperimentalFoundationApi
interface LazyLayoutItemProvider {
/** The total number of items in the lazy layout (visible or not). */
@@ -64,7 +62,6 @@
* Finds a position of the item with the given key in the lists. This logic allows us to detect when
* there were items added or removed before our current first item.
*/
-@ExperimentalFoundationApi
internal fun LazyLayoutItemProvider.findIndexByKey(
key: Any?,
lastKnownIndex: Int,
@@ -95,6 +92,4 @@
* layouts. LazyLayout and all corresponding APIs are still under development and are subject to
* change.
*/
-@ExperimentalFoundationApi
-@Suppress("MissingNullability")
-expect fun getDefaultLazyLayoutKey(index: Int): Any
+@Suppress("MissingNullability") expect fun getDefaultLazyLayoutKey(index: Int): Any
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt
index 91f0480..f5746d1 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutKeyIndexMap.kt
@@ -19,7 +19,6 @@
import androidx.collection.MutableObjectIntMap
import androidx.collection.ObjectIntMap
import androidx.collection.emptyObjectIntMap
-import androidx.compose.foundation.ExperimentalFoundationApi
/**
* A key-index mapping used inside the [LazyLayoutItemProvider]. It might not contain all items in
@@ -46,7 +45,6 @@
* Implementation of [LazyLayoutKeyIndexMap] indexing over given [IntRange] of items. Items outside
* of given range are considered unknown, with null returned as the index.
*/
-@ExperimentalFoundationApi
internal class NearestRangeKeyIndexMap(
nearestRange: IntRange,
intervalContent: LazyLayoutIntervalContent<*>
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutMeasureScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutMeasureScope.kt
index 763de38..f393626 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutMeasureScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutMeasureScope.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Stable
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.geometry.isSpecified
@@ -46,7 +45,6 @@
* change.
*/
@Stable
-@ExperimentalFoundationApi
sealed interface LazyLayoutMeasureScope : MeasureScope {
/**
* Subcompose and measure the item of lazy layout.
@@ -96,7 +94,6 @@
}
}
-@ExperimentalFoundationApi
internal class LazyLayoutMeasureScopeImpl
internal constructor(
private val itemContentFactory: LazyLayoutItemContentFactory,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutPinnableItem.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutPinnableItem.kt
index 06c199f..3ad177c5 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutPinnableItem.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutPinnableItem.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.DisposableEffect
@@ -43,7 +42,6 @@
* layouts. LazyLayout and all corresponding APIs are still under development and are subject to
* change.
*/
-@ExperimentalFoundationApi
@Composable
fun LazyLayoutPinnableItem(
key: Any?,
@@ -65,7 +63,6 @@
* Note: this class is a part of [LazyLayout] harness that allows for building custom lazy layouts.
* LazyLayout and all corresponding APIs are still under development and are subject to change.
*/
-@ExperimentalFoundationApi
class LazyLayoutPinnedItemList private constructor(private val items: MutableList<PinnedItem>) :
List<LazyLayoutPinnedItemList.PinnedItem> by items {
constructor() : this(SnapshotStateList())
@@ -86,7 +83,6 @@
* layouts. LazyLayout and all corresponding APIs are still under development and are subject to
* change.
*/
- @ExperimentalFoundationApi
sealed interface PinnedItem {
/** Key of the pinned item. */
val key: Any?
@@ -99,7 +95,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class LazyLayoutPinnableItem(
override val key: Any?,
private val pinnedItemList: LazyLayoutPinnedItemList,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutSemantics.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutSemantics.kt
index a373688..dddefb9 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutSemantics.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/LazyLayoutSemantics.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -36,7 +35,6 @@
import androidx.compose.ui.semantics.verticalScrollAxisRange
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun Modifier.lazyLayoutSemantics(
itemProviderLambda: () -> LazyLayoutItemProvider,
@@ -54,7 +52,6 @@
reverseScrolling = reverseScrolling,
)
-@OptIn(ExperimentalFoundationApi::class)
private class LazyLayoutSemanticsModifier(
val itemProviderLambda: () -> LazyLayoutItemProvider,
val state: LazyLayoutSemanticState,
@@ -108,7 +105,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class LazyLayoutSemanticsModifierNode(
private var itemProviderLambda: () -> LazyLayoutItemProvider,
private var state: LazyLayoutSemanticState,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.kt
index 2d87228..0b46f35 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.kt
@@ -16,16 +16,13 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
/**
* Remembers the platform-specific implementation for scheduling lazy layout item prefetch
* (pre-composing next items in advance during the scrolling).
*/
-@ExperimentalFoundationApi
-@Composable
-internal expect fun rememberDefaultPrefetchScheduler(): PrefetchScheduler
+@Composable internal expect fun rememberDefaultPrefetchScheduler(): PrefetchScheduler
/**
* Implementations of this interface accept prefetch requests via [schedulePrefetch] and decide when
@@ -37,7 +34,6 @@
* when it still has more to do but doesn't think it can complete it within
* [PrefetchRequestScope.availableTimeNanos].
*/
-@ExperimentalFoundationApi
interface PrefetchScheduler {
/**
@@ -51,7 +47,6 @@
* A request for prefetch which can be submitted to a [PrefetchScheduler] to execute during idle
* time.
*/
-@ExperimentalFoundationApi
sealed interface PrefetchRequest {
/**
@@ -69,7 +64,6 @@
* Scope for [PrefetchRequest.execute], supplying info about how much time it has to execute
* requests.
*/
-@ExperimentalFoundationApi
interface PrefetchRequestScope {
/**
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimateScrollScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimateScrollScope.kt
index 37531ea..0463808 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimateScrollScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridAnimateScrollScope.kt
@@ -16,14 +16,12 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.foundation.lazy.layout.LazyLayoutAnimateScrollScope
import androidx.compose.ui.util.fastFirstOrNull
import androidx.compose.ui.util.fastSumBy
-@ExperimentalFoundationApi
internal class LazyStaggeredGridAnimateScrollScope(private val state: LazyStaggeredGridState) :
LazyLayoutAnimateScrollScope {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridIntervalContent.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridIntervalContent.kt
index 547d91f..6fc3d24 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridIntervalContent.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridIntervalContent.kt
@@ -16,12 +16,10 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutIntervalContent
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import androidx.compose.runtime.Composable
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyStaggeredGridIntervalContent(content: LazyStaggeredGridScope.() -> Unit) :
LazyStaggeredGridScope, LazyLayoutIntervalContent<LazyStaggeredGridInterval>() {
@@ -59,7 +57,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyStaggeredGridInterval(
override val key: ((index: Int) -> Any)?,
override val type: ((index: Int) -> Any?),
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
index 9e181be..525a52f 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemProvider.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutPinnableItem
@@ -27,13 +26,11 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
-@OptIn(ExperimentalFoundationApi::class)
internal interface LazyStaggeredGridItemProvider : LazyLayoutItemProvider {
val spanProvider: LazyStaggeredGridSpanProvider
val keyIndexMap: LazyLayoutKeyIndexMap
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberStaggeredGridItemProviderLambda(
state: LazyStaggeredGridState,
@@ -59,7 +56,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class LazyStaggeredGridItemProviderImpl(
private val state: LazyStaggeredGridState,
private val intervalContent: LazyStaggeredGridIntervalContent,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemScope.kt
index 8c01597..0d6b149 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridItemScope.kt
@@ -20,7 +20,6 @@
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.VisibilityThreshold
import androidx.compose.animation.core.spring
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutAnimateItemElement
import androidx.compose.runtime.Stable
import androidx.compose.ui.Modifier
@@ -55,34 +54,6 @@
),
fadeOutSpec: FiniteAnimationSpec<Float>? = spring(stiffness = Spring.StiffnessMediumLow),
): Modifier
-
- /**
- * This modifier animates the item placement within the grid.
- *
- * When you scroll backward staggered grids could move already visible items in order to correct
- * the accumulated errors in previous item size estimations. This modifier can animate such
- * moves.
- *
- * Aside from that when you provide a key via [LazyStaggeredGridScope.item] /
- * [LazyStaggeredGridScope.items] this modifier will enable item reordering animations.
- *
- * @param animationSpec a finite animation that will be used to animate the item placement.
- */
- @Deprecated(
- "Use Modifier.animateItem() instead",
- ReplaceWith(
- "Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null, " +
- "placementSpec = animationSpec)"
- )
- )
- @ExperimentalFoundationApi
- fun Modifier.animateItemPlacement(
- animationSpec: FiniteAnimationSpec<IntOffset> =
- spring(
- stiffness = Spring.StiffnessMediumLow,
- visibilityThreshold = IntOffset.VisibilityThreshold
- )
- ): Modifier = animateItem(fadeInSpec = null, placementSpec = animationSpec, fadeOutSpec = null)
}
internal object LazyStaggeredGridItemScopeImpl : LazyStaggeredGridItemScope {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
index 9b74b82..e80a2f0 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasure.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemAnimator
import androidx.compose.foundation.lazy.layout.LazyLayoutKeyIndexMap
import androidx.compose.foundation.lazy.layout.LazyLayoutMeasureScope
@@ -47,7 +46,6 @@
private const val DebugLoggingEnabled = false
-@ExperimentalFoundationApi
private inline fun <T> withDebugLogging(
scope: LazyLayoutMeasureScope,
block: LazyLayoutMeasureScope.() -> T
@@ -79,7 +77,6 @@
}
}
-@ExperimentalFoundationApi
internal fun LazyLayoutMeasureScope.measureStaggeredGrid(
state: LazyStaggeredGridState,
pinnedItems: List<Int>,
@@ -175,7 +172,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyStaggeredGridMeasureContext(
val state: LazyStaggeredGridState,
val pinnedItems: List<Int>,
@@ -247,7 +243,6 @@
get() = if (isFullSpan) FullSpan else start
}
-@ExperimentalFoundationApi
private fun LazyStaggeredGridMeasureContext.measure(
initialScrollDelta: Int,
initialItemIndices: IntArray,
@@ -950,7 +945,6 @@
return positionedItems
}
-@ExperimentalFoundationApi
private inline fun LazyStaggeredGridMeasureContext.calculateExtraItems(
position: (LazyStaggeredGridMeasuredItem) -> Unit,
filter: (itemIndex: Int) -> Boolean,
@@ -1077,7 +1071,6 @@
private fun LazyStaggeredGridMeasureContext.findPreviousItemIndex(item: Int, lane: Int): Int =
laneInfo.findPreviousItemIndex(item, lane)
-@OptIn(ExperimentalFoundationApi::class)
internal abstract class LazyStaggeredGridMeasureProvider(
private val isVertical: Boolean,
private val itemProvider: LazyStaggeredGridItemProvider,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
index 7fa53f8..0a1ec49 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasurePolicy.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.checkScrollableContainerConstraints
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.PaddingValues
@@ -35,7 +34,6 @@
import androidx.compose.ui.unit.constrainWidth
import kotlinx.coroutines.CoroutineScope
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberStaggeredGridMeasurePolicy(
state: LazyStaggeredGridState,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasureResult.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasureResult.kt
index 368615a..d070bc0 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasureResult.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridMeasureResult.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.lazy.layout.MutableIntervalList
import androidx.compose.ui.layout.AlignmentLine
@@ -234,7 +233,6 @@
private val EmptyArray = IntArray(0)
-@OptIn(ExperimentalFoundationApi::class)
internal val EmptyLazyStaggeredGridLayoutInfo =
LazyStaggeredGridMeasureResult(
firstVisibleItemIndices = EmptyArray,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollPosition.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollPosition.kt
index 8d8a6eef..416e166 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollPosition.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridScrollPosition.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutItemProvider
import androidx.compose.foundation.lazy.layout.LazyLayoutNearestRangeState
import androidx.compose.foundation.lazy.layout.findIndexByKey
@@ -26,7 +25,6 @@
import androidx.compose.runtime.snapshots.Snapshot
import androidx.compose.ui.util.fastFirstOrNull
-@ExperimentalFoundationApi
internal class LazyStaggeredGridScrollPosition(
initialIndices: IntArray,
initialOffsets: IntArray,
@@ -131,7 +129,6 @@
* were items added or removed before our current first visible item and keep this item as the
* first visible one even given that its index has been changed.
*/
- @ExperimentalFoundationApi
fun updateScrollPositionIfTheFirstItemWasMoved(
itemProvider: LazyLayoutItemProvider,
indices: IntArray
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemantics.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemantics.kt
index 06cabe4..cbfb824 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemantics.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSemantics.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.lazy.layout.LazyLayoutSemanticState
import androidx.compose.foundation.lazy.layout.estimatedLazyMaxScrollOffset
@@ -25,7 +24,6 @@
import androidx.compose.runtime.remember
import androidx.compose.ui.semantics.CollectionInfo
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberLazyStaggeredGridSemanticState(
state: LazyStaggeredGridState,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt
index 1979a32..b094682 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/staggeredgrid/LazyStaggeredGridSpan.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.lazy.staggeredgrid
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.IntervalList
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridItemSpan.Companion.FullLine
@@ -37,7 +36,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class LazyStaggeredGridSpanProvider(
val intervals: IntervalList<LazyStaggeredGridInterval>
) {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/LazyLayoutPager.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/LazyLayoutPager.kt
index 24d396c..2fac3d0 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/LazyLayoutPager.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/LazyLayoutPager.kt
@@ -64,7 +64,6 @@
import kotlin.math.roundToInt
import kotlinx.coroutines.coroutineScope
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun Pager(
/** Modifier to be applied for the inner layout */
@@ -195,7 +194,6 @@
)
}
-@ExperimentalFoundationApi
internal class PagerLazyLayoutItemProvider(
private val state: PagerState,
private val intervalContent: LazyLayoutIntervalContent<PagerIntervalContent>,
@@ -235,7 +233,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class PagerLayoutIntervalContent(
val pageContent: @Composable PagerScope.(page: Int) -> Unit,
val key: ((index: Int) -> Any)?,
@@ -247,13 +244,11 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
internal class PagerIntervalContent(
override val key: ((page: Int) -> Any)?,
val item: @Composable PagerScope.(page: Int) -> Unit
) : LazyLayoutIntervalContent.Interval
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun rememberPagerItemProviderLambda(
state: PagerState,
@@ -305,7 +300,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private class PagerBringIntoViewSpec(
val pagerState: PagerState,
val defaultBringIntoViewSpec: BringIntoViewSpec
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerLazyAnimateScrollScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerLazyAnimateScrollScope.kt
index 5fc09ff..b06a48e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerLazyAnimateScrollScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerLazyAnimateScrollScope.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.ScrollScope
import androidx.compose.foundation.lazy.layout.LazyLayoutAnimateScrollScope
@@ -25,7 +24,6 @@
* scope contains information about the layout where animated scroll can be performed as well as the
* necessary tools to do that respecting the scroll mutation priority.
*/
-@ExperimentalFoundationApi
internal fun PagerLazyAnimateScrollScope(state: PagerState): LazyLayoutAnimateScrollScope {
return object : LazyLayoutAnimateScrollScope {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt
index 5bdfc9b..1201e17 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasure.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.snapping.SnapPosition
import androidx.compose.foundation.gestures.snapping.calculateDistanceToDesiredSnapPosition
@@ -38,7 +37,6 @@
import kotlin.math.abs
import kotlinx.coroutines.CoroutineScope
-@OptIn(ExperimentalFoundationApi::class)
internal fun LazyLayoutMeasureScope.measurePager(
pageCount: Int,
pagerItemProvider: PagerLazyLayoutItemProvider,
@@ -562,7 +560,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
private fun LazyLayoutMeasureScope.getAndMeasure(
index: Int,
childConstraints: Constraints,
@@ -592,7 +589,6 @@
)
}
-@OptIn(ExperimentalFoundationApi::class)
private fun LazyLayoutMeasureScope.calculatePagesOffsets(
pages: List<MeasuredPage>,
extraPagesBefore: List<MeasuredPage>,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasurePolicy.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasurePolicy.kt
index 5e3ddb13..de7d2a6 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasurePolicy.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerMeasurePolicy.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.checkScrollableContainerConstraints
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.snapping.SnapPosition
@@ -38,7 +37,6 @@
import androidx.compose.ui.unit.offset
import kotlinx.coroutines.CoroutineScope
-@OptIn(ExperimentalFoundationApi::class)
@Composable
internal fun rememberPagerMeasurePolicy(
itemProviderLambda: () -> PagerLazyLayoutItemProvider,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt
index e1419c9..7576c9e 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerScrollPosition.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.pager
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.layout.LazyLayoutNearestRangeState
import androidx.compose.foundation.lazy.layout.findIndexByKey
import androidx.compose.runtime.getValue
@@ -29,7 +28,6 @@
* Contains the current scroll position represented by the first visible page and the first visible
* page scroll offset.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class PagerScrollPosition(
currentPage: Int = 0,
currentPageOffsetFraction: Float = 0.0f,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerState.kt
index 049786a..bb836a7 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/pager/PagerState.kt
@@ -497,7 +497,6 @@
* @param pageOffsetFraction A fraction of the page size that indicates the offset the
* destination page will be offset from its snapped position.
*/
- @ExperimentalFoundationApi
fun ScrollScope.updateCurrentPage(
page: Int,
@FloatRange(from = -0.5, to = 0.5) pageOffsetFraction: Float = 0.0f
@@ -517,7 +516,6 @@
*
* @sample androidx.compose.foundation.samples.PagerCustomAnimateScrollToPage
*/
- @ExperimentalFoundationApi
fun ScrollScope.updateTargetPage(targetPage: Int) {
programmaticScrollTargetPage = targetPage.coerceInPageRange()
}
@@ -906,7 +904,6 @@
.toLong()
}
-@OptIn(ExperimentalFoundationApi::class)
private suspend fun LazyLayoutAnimateScrollScope.animateScrollToPage(
targetPage: Int,
targetPageOffsetToSnappedPosition: Float,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequester.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequester.kt
index 85246e3..47b906b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequester.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewRequester.kt
@@ -19,7 +19,6 @@
package androidx.compose.foundation.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.collection.mutableVectorOf
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Rect
@@ -39,7 +38,6 @@
* @sample androidx.compose.foundation.samples.BringIntoViewSample
* @sample androidx.compose.foundation.samples.BringPartOfComposableIntoViewSample
*/
-@ExperimentalFoundationApi
sealed interface BringIntoViewRequester {
/**
* Bring this item into bounds by making all the scrollable parents scroll appropriately.
@@ -75,7 +73,6 @@
* Note: this API is experimental while we optimise the performance and find the right API shape for
* it
*/
-@ExperimentalFoundationApi
fun BringIntoViewRequester(): BringIntoViewRequester {
return BringIntoViewRequesterImpl()
}
@@ -97,11 +94,9 @@
* it
*/
@Suppress("ModifierInspectorInfo")
-@ExperimentalFoundationApi
fun Modifier.bringIntoViewRequester(bringIntoViewRequester: BringIntoViewRequester): Modifier =
this.then(BringIntoViewRequesterElement(bringIntoViewRequester))
-@ExperimentalFoundationApi
private class BringIntoViewRequesterImpl : BringIntoViewRequester {
val modifiers = mutableVectorOf<BringIntoViewRequesterNode>()
@@ -110,7 +105,6 @@
}
}
-@ExperimentalFoundationApi
private class BringIntoViewRequesterElement(private val requester: BringIntoViewRequester) :
ModifierNodeElement<BringIntoViewRequesterNode>() {
override fun create(): BringIntoViewRequesterNode {
@@ -141,7 +135,6 @@
* access to the next [BringIntoViewParent] via [findBringIntoViewParent], and uses that parent to
* respond to requests to [scrollIntoView].
*/
-@ExperimentalFoundationApi
internal class BringIntoViewRequesterNode(private var requester: BringIntoViewRequester) :
Modifier.Node() {
override val shouldAutoInvalidate: Boolean = false
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponder.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponder.kt
index 271ef11..fff555d 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponder.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/relocation/BringIntoViewResponder.kt
@@ -19,7 +19,6 @@
package androidx.compose.foundation.relocation
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.layout.LayoutCoordinates
@@ -57,7 +56,6 @@
* Note: this API is experimental while we optimise the performance and find the right API shape for
* it
*/
-@ExperimentalFoundationApi
interface BringIntoViewResponder {
/**
@@ -73,7 +71,7 @@
* should be the destination rectangle that [localRect] will eventually occupy, once the
* scrolling animation is finished.
*/
- @ExperimentalFoundationApi fun calculateRectForParent(localRect: Rect): Rect
+ fun calculateRectForParent(localRect: Rect): Rect
/**
* Bring this specified rectangle into bounds by making this scrollable parent scroll
@@ -89,7 +87,7 @@
* bounds of the request change while the request is being processed. If the rectangle cannot
* be calculated, e.g. because the [LayoutCoordinates] are not attached, return null.
*/
- @ExperimentalFoundationApi suspend fun bringChildIntoView(localRect: () -> Rect?)
+ suspend fun bringChildIntoView(localRect: () -> Rect?)
}
/**
@@ -104,11 +102,9 @@
* it
*/
@Suppress("ModifierInspectorInfo")
-@ExperimentalFoundationApi
fun Modifier.bringIntoViewResponder(responder: BringIntoViewResponder): Modifier =
this.then(BringIntoViewResponderElement(responder))
-@ExperimentalFoundationApi
private class BringIntoViewResponderElement(private val responder: BringIntoViewResponder) :
ModifierNodeElement<BringIntoViewResponderNode>() {
override fun create(): BringIntoViewResponderNode = BringIntoViewResponderNode(responder)
@@ -138,7 +134,6 @@
* itself as the [BringIntoViewParent] for subsequent modifiers. This class is responsible for
* recursively propagating requests up the responder chain.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class BringIntoViewResponderNode(var responder: BringIntoViewResponder) :
Modifier.Node(), BringIntoViewParent, LayoutAwareModifierNode, TraversableNode {
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt
index 3035bc8..c4b0e48 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/BasicTextField.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.Orientation
@@ -210,7 +209,6 @@
* codepoints.
*/
// This takes a composable lambda, but it is not primarily a container.
-@OptIn(ExperimentalFoundationApi::class)
@Suppress("ComposableLambdaParameterPosition")
@Composable
internal fun BasicTextField(
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/ClickableText.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/ClickableText.kt
index 242a969..6ba88a2 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/ClickableText.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/ClickableText.kt
@@ -15,23 +15,17 @@
*/
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.pointer.PointerEventPass
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.MultiParagraph
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
-import kotlinx.coroutines.launch
/**
* A continent version of [BasicText] component to be able to handle click event on the text.
@@ -103,99 +97,3 @@
}
)
}
-
-/**
- * A continent version of [BasicText] component to be able to handle click event on the text.
- *
- * This is a shorthand of [BasicText] with [pointerInput] to be able to handle click event easily.
- *
- * @sample androidx.compose.foundation.samples.ClickableText
- *
- * For other gestures, e.g. long press, dragging, follow sample code.
- *
- * @sample androidx.compose.foundation.samples.LongClickableText
- * @param text The text to be displayed.
- * @param modifier Modifier to apply to this layout node.
- * @param style Style configuration for the text such as color, font, line height etc.
- * @param softWrap Whether the text should break at soft line breaks. If false, the glyphs in the
- * text will be positioned as if there was unlimited horizontal space. If [softWrap] is false,
- * [overflow] and [TextAlign] may have unexpected effects.
- * @param overflow How visual overflow should be handled.
- * @param maxLines An optional maximum number of lines for the text to span, wrapping if necessary.
- * If the text exceeds the given number of lines, it will be truncated according to [overflow] and
- * [softWrap]. If it is not null, then it must be greater than zero.
- * @param onTextLayout Callback that is executed when a new text layout is calculated. A
- * [TextLayoutResult] object that callback provides contains paragraph information, size of the
- * text, baselines and other details. The callback can be used to add additional decoration or
- * functionality to the text. For example, to draw selection around the text.
- * @param onHover Callback that is executed when user hovers over the text with a mouse or trackpad.
- * This callback is called with the hovered character's offset or null if the cursor is no longer
- * hovering this.
- * @param onClick Callback that is executed when users click the text. This callback is called with
- * clicked character's offset.
- *
- * Note: this composable is now deprecated. Instead, use regular [androidx.compose.material3.Text]
- * or [androidx.compose.foundation.text.BasicText] and pass an AnnotatedString that contains a
- * [androidx.compose.ui.text.LinkAnnotation].
- *
- * @see BasicText
- * @see androidx.compose.ui.input.pointer.pointerInput
- * @see androidx.compose.foundation.gestures.detectTapGestures
- */
-@ExperimentalFoundationApi // when removing this experimental annotation,
-// onHover should be nullable with null as default. The other ClickableText
-// should be deprecated as hidden and simply call this function.
-@Composable
-@Deprecated("Use Text or BasicText and pass an AnnotatedString that contains a LinkAnnotation")
-fun ClickableText(
- text: AnnotatedString,
- onHover: ((Int?) -> Unit),
- modifier: Modifier = Modifier,
- style: TextStyle = TextStyle.Default,
- softWrap: Boolean = true,
- overflow: TextOverflow = TextOverflow.Clip,
- maxLines: Int = Int.MAX_VALUE,
- onTextLayout: (TextLayoutResult) -> Unit = {},
- onClick: (Int) -> Unit
-) {
- val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
- val coroutineScope = rememberCoroutineScope()
-
- fun getOffset(positionOffset: Offset): Int? =
- layoutResult.value
- ?.multiParagraph
- ?.takeIf { it.containsWithinBounds(positionOffset) }
- ?.getOffsetForPosition(positionOffset)
-
- val pointerInputModifier =
- Modifier.pointerInput(onClick, onHover) {
- coroutineScope.launch {
- var previousIndex: Int? = null
- detectMoves(PointerEventPass.Main) { pos ->
- val index = getOffset(pos)
- if (previousIndex != index) {
- previousIndex = index
- onHover(index)
- }
- }
- }
-
- detectTapGestures { pos -> getOffset(pos)?.let(onClick) }
- }
-
- BasicText(
- text = text,
- modifier = modifier.then(pointerInputModifier),
- style = style,
- softWrap = softWrap,
- overflow = overflow,
- maxLines = maxLines,
- onTextLayout = {
- layoutResult.value = it
- onTextLayout(it)
- }
- )
-}
-
-private fun MultiParagraph.containsWithinBounds(positionOffset: Offset): Boolean =
- positionOffset.let { (x, y) -> x > 0 && y >= 0 && x <= width && y <= height }
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
index e1df84a..530e37b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
@@ -18,7 +18,6 @@
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.interaction.Interaction
@@ -200,7 +199,6 @@
* innerTextField exactly once.
*/
@Composable
-@OptIn(ExperimentalFoundationApi::class)
internal fun CoreTextField(
value: TextFieldValue,
onValueChange: (TextFieldValue) -> Unit,
@@ -1117,7 +1115,6 @@
* This function is used to handle 2, 3, and 4, and the others are automatically handled by the
* focus system.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal suspend fun BringIntoViewRequester.bringSelectionEndIntoView(
value: TextFieldValue,
textDelegate: TextDelegate,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextLinkScope.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextLinkScope.kt
index 30e04e0..c869f8b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextLinkScope.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/TextLinkScope.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.hoverable
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -62,7 +61,6 @@
* This class assumes that links exist and does not perform any additional check inside its methods.
* Therefore this class initialisation should be guarded by the `hasLinks` check.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class TextLinkScope(internal val initialText: AnnotatedString) {
var textLayoutResult: TextLayoutResult? by mutableStateOf(null)
@@ -145,7 +143,6 @@
* [TextLinkScope] object created *only* when there are links present in the text, we don't need
* to do any additional guarding inside this composable function.
*/
- @OptIn(ExperimentalFoundationApi::class)
@Composable
fun LinksComposables() {
val uriHandler = LocalUriHandler.current
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextFieldBuffer.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextFieldBuffer.kt
index 16f3f31..43420ee 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextFieldBuffer.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextFieldBuffer.kt
@@ -43,7 +43,6 @@
* To get one of these, and for usage samples, see [TextFieldState.edit]. Every change to the buffer
* is tracked in a [ChangeList] which you can access via the [changes] property.
*/
-@OptIn(ExperimentalFoundationApi::class)
class TextFieldBuffer
internal constructor(
initialValue: TextFieldCharSequence,
@@ -353,7 +352,6 @@
* appear in the text, not the order in which they were made. Overlapping changes are
* represented as a single change.
*/
- @ExperimentalFoundationApi
interface ChangeList {
/** The number of changes that have been performed. */
val changeCount: Int
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextUndoManager.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextUndoManager.kt
index a393c7a..a07c6f3 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextUndoManager.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/TextUndoManager.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.SNAPSHOTS_INTERVAL_MILLIS
import androidx.compose.foundation.text.input.internal.undo.TextDeleteType
import androidx.compose.foundation.text.input.internal.undo.TextEditType
@@ -204,7 +203,6 @@
* @param allowMerge Whether to allow merging the calculated operation with the last operation in
* the stack.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal fun TextUndoManager.recordChanges(
pre: TextFieldCharSequence,
post: TextFieldCharSequence,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/UndoState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/UndoState.kt
index a722012..2b918e1 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/UndoState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/UndoState.kt
@@ -16,10 +16,7 @@
package androidx.compose.foundation.text.input
-import androidx.compose.foundation.ExperimentalFoundationApi
-
/** Defines an interactable undo history. */
-@ExperimentalFoundationApi
class UndoState internal constructor(private val state: TextFieldState) {
/**
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/ChangeTracker.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/ChangeTracker.kt
index ea96a80..757f19b 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/ChangeTracker.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/ChangeTracker.kt
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalFoundationApi::class)
-
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.input.TextFieldBuffer.ChangeList
import androidx.compose.runtime.collection.mutableVectorOf
import androidx.compose.ui.text.TextRange
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldCoreModifier.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldCoreModifier.kt
index f36aa89..9fdd472 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldCoreModifier.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldCoreModifier.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollBy
@@ -122,7 +121,6 @@
}
/** Modifier node for [TextFieldCoreModifier]. */
-@OptIn(ExperimentalFoundationApi::class)
internal class TextFieldCoreModifierNode(
// true iff this component is focused and the window is focused
private var isFocused: Boolean,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.kt
index fd46998..ac8290f 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.content.MediaType
import androidx.compose.ui.draganddrop.DragAndDropEvent
import androidx.compose.ui.draganddrop.DragAndDropModifierNode
@@ -24,7 +23,6 @@
import androidx.compose.ui.platform.ClipEntry
import androidx.compose.ui.platform.ClipMetadata
-@OptIn(ExperimentalFoundationApi::class)
internal expect fun textFieldDragAndDropNode(
hintMediaTypes: () -> Set<MediaType>,
onDrop: (clipEntry: ClipEntry, clipMetadata: ClipMetadata) -> Boolean,
diff --git a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextLayoutState.kt b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextLayoutState.kt
index afe578f..830e040 100644
--- a/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextLayoutState.kt
+++ b/compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/input/internal/TextLayoutState.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.runtime.getValue
@@ -38,7 +37,6 @@
* Manages text layout for TextField including layout coordinates of decoration box and inner text
* field.
*/
-@OptIn(ExperimentalFoundationApi::class)
internal class TextLayoutState {
private var layoutCache = TextFieldLayoutStateCache()
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/BasicTooltip.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/BasicTooltip.desktop.kt
index 0b07030..e906226 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/BasicTooltip.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/BasicTooltip.desktop.kt
@@ -44,7 +44,6 @@
* @param content the composable that the tooltip will anchor to.
*/
@Composable
-@OptIn(ExperimentalFoundationApi::class)
actual fun BasicTooltipBox(
positionProvider: PopupPositionProvider,
tooltip: @Composable () -> Unit,
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/DesktopOverscroll.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/DesktopOverscroll.desktop.kt
index bd9dcef..94ca5b1 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/DesktopOverscroll.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/DesktopOverscroll.desktop.kt
@@ -18,6 +18,4 @@
import androidx.compose.runtime.Composable
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-internal actual fun rememberOverscrollEffect(): OverscrollEffect = NoOpOverscrollEffect
+@Composable internal actual fun rememberOverscrollEffect(): OverscrollEffect = NoOpOverscrollEffect
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/TooltipArea.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/TooltipArea.desktop.kt
index 542ac91..cb4460ec 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/TooltipArea.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/TooltipArea.desktop.kt
@@ -55,7 +55,6 @@
* @param tooltipPlacement Defines position of the tooltip.
* @param content Composable content that the current tooltip is set to.
*/
-@OptIn(ExperimentalFoundationApi::class)
@Composable
@Deprecated(
"Use TooltipArea",
@@ -82,7 +81,6 @@
* @param tooltipPlacement Defines position of the tooltip.
* @param content Composable content that the current tooltip is set to.
*/
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun TooltipArea(
tooltip: @Composable () -> Unit,
@@ -171,7 +169,6 @@
}
/** An interface for providing a [PopupPositionProvider] for the tooltip. */
-@ExperimentalFoundationApi
interface TooltipPlacement {
/** Returns [PopupPositionProvider] implementation. */
@Composable fun positionProvider(): PopupPositionProvider
@@ -185,7 +182,6 @@
* @param windowMargin Defines the area within the window that limits the placement of the
* popup.
*/
- @ExperimentalFoundationApi
class CursorPoint(
private val offset: DpOffset = DpOffset.Zero,
private val alignment: Alignment = Alignment.BottomEnd,
@@ -204,7 +200,6 @@
* @param alignment The alignment of the popup relative to the [anchor] point.
* @param offset [DpOffset] to be added to the position of the popup.
*/
- @ExperimentalFoundationApi
class ComponentRect(
private val anchor: Alignment = Alignment.BottomCenter,
private val alignment: Alignment = Alignment.BottomCenter,
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/content/MediaType.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/content/MediaType.desktop.kt
index 3f53af5..9bb0b64 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/content/MediaType.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/content/MediaType.desktop.kt
@@ -16,10 +16,8 @@
package androidx.compose.foundation.content
-import androidx.compose.foundation.ExperimentalFoundationApi
import java.awt.datatransfer.DataFlavor
-@ExperimentalFoundationApi
actual class MediaType internal constructor(val dataFlavor: DataFlavor) {
actual constructor(representation: String) : this(DataFlavor(representation))
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.desktop.kt
index e5a2917..4b06618 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/gestures/BringIntoViewSpec.desktop.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.gestures
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.staticCompositionLocalOf
@@ -26,8 +25,6 @@
* the least to bring the requested region into view.
*/
@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
-@get:ExperimentalFoundationApi
-@ExperimentalFoundationApi
actual val LocalBringIntoViewSpec: ProvidableCompositionLocal<BringIntoViewSpec> =
staticCompositionLocalOf {
BringIntoViewSpec.DefaultBringIntoViewSpec
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.desktop.kt
index 52bd70a9..2f05c01 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/Lazy.desktop.kt
@@ -16,9 +16,6 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
-
-@ExperimentalFoundationApi
actual fun getDefaultLazyLayoutKey(index: Int): Any = DefaultLazyKey(index)
private data class DefaultLazyKey(private val index: Int)
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.desktop.kt
index da15b5f..6b763da 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/lazy/layout/PrefetchScheduler.desktop.kt
@@ -16,16 +16,13 @@
package androidx.compose.foundation.lazy.layout
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
-@ExperimentalFoundationApi
@Composable
actual fun rememberDefaultPrefetchScheduler(): PrefetchScheduler {
return NoOpPrefetchScheduler
}
-@ExperimentalFoundationApi
private object NoOpPrefetchScheduler : PrefetchScheduler {
override fun schedulePrefetch(prefetchRequest: PrefetchRequest) {}
}
diff --git a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.desktop.kt b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.desktop.kt
index cc570df..fdccc7e 100644
--- a/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.desktop.kt
+++ b/compose/foundation/foundation/src/desktopMain/kotlin/androidx/compose/foundation/text/input/internal/TextFieldDragAndDropNode.desktop.kt
@@ -16,7 +16,6 @@
package androidx.compose.foundation.text.input.internal
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.content.MediaType
import androidx.compose.ui.draganddrop.DragAndDropEvent
import androidx.compose.ui.draganddrop.DragAndDropModifierNode
@@ -25,7 +24,6 @@
import androidx.compose.ui.platform.ClipMetadata
/** System DragAndDrop is not yet supported on Desktop flavor of BTF2. */
-@OptIn(ExperimentalFoundationApi::class)
internal actual fun textFieldDragAndDropNode(
hintMediaTypes: () -> Set<MediaType>,
onDrop: (clipEntry: ClipEntry, clipMetadata: ClipMetadata) -> Boolean,
diff --git a/compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/ScrollbarTest.kt b/compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/ScrollbarTest.kt
index 5d8e7fd0..5feaf7b 100644
--- a/compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/ScrollbarTest.kt
+++ b/compose/foundation/foundation/src/desktopTest/kotlin/androidx/compose/foundation/ScrollbarTest.kt
@@ -291,7 +291,6 @@
}
@Suppress("SameParameterValue")
- @OptIn(ExperimentalFoundationApi::class)
@Test(timeout = 3000)
fun `scroll by less than one page in lazy list`() {
runBlocking(Dispatchers.Main) {
@@ -319,7 +318,6 @@
}
@Suppress("SameParameterValue")
- @OptIn(ExperimentalFoundationApi::class)
@Test(timeout = 3000)
fun `scroll in reversed lazy list`() {
runBlocking(Dispatchers.Main) {
@@ -348,7 +346,6 @@
}
@Suppress("SameParameterValue")
- @OptIn(ExperimentalFoundationApi::class)
@Test(timeout = 3000)
fun `scroll by more than one page in lazy list`() {
runBlocking(Dispatchers.Main) {
@@ -376,7 +373,6 @@
}
@Suppress("SameParameterValue")
- @OptIn(ExperimentalFoundationApi::class)
@Test(timeout = 3000)
fun `scroll outside of scrollbar bounds in lazy list`() {
runBlocking(Dispatchers.Main) {
@@ -502,7 +498,6 @@
}
@Suppress("SameParameterValue")
- @OptIn(ExperimentalFoundationApi::class)
@Composable
private fun LazyTestBox(
state: LazyListState = rememberLazyListState(),
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
index ca0da94..130f0a0 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerActivity.kt
@@ -19,7 +19,6 @@
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
@@ -37,7 +36,6 @@
import androidx.compose.ui.unit.dp
class PagerActivity : ComponentActivity() {
- @OptIn(ExperimentalFoundationApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerAsCarouselActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerAsCarouselActivity.kt
index 39da0f2..8ef3b6a 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerAsCarouselActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerAsCarouselActivity.kt
@@ -19,7 +19,6 @@
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
@@ -38,7 +37,6 @@
import androidx.compose.ui.unit.dp
class PagerAsCarouselActivity : ComponentActivity() {
- @OptIn(ExperimentalFoundationApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt
index 6a259f1..b1a4a95 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt
+++ b/compose/integration-tests/macrobenchmark-target/src/main/java/androidx/compose/integration/macrobenchmark/target/PagerOfLazyGridActivity.kt
@@ -19,7 +19,6 @@
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
@@ -57,7 +56,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun HorizontalPagerOfLazyGrid(pages: Int = 100, gridItems: Int = 100) {
val pagerState: PagerState = rememberPagerState(initialPage = 1) { pages }
diff --git a/compose/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/specification/Specification.kt b/compose/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/specification/Specification.kt
index b4e23c6..efe7dae 100644
--- a/compose/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/specification/Specification.kt
+++ b/compose/integration-tests/material-catalog/src/main/java/androidx/compose/material/catalog/ui/specification/Specification.kt
@@ -16,7 +16,6 @@
package androidx.compose.material.catalog.ui.specification
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
@@ -38,7 +37,6 @@
import androidx.compose.ui.unit.dp
@Composable
-@OptIn(ExperimentalFoundationApi::class)
fun Specification(
specifications: List<Specification>,
onSpecificationClick: (specification: Specification) -> Unit
diff --git a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/ModelSamples.kt b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/ModelSamples.kt
index 19f805a..ef80abd 100644
--- a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/ModelSamples.kt
+++ b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/ModelSamples.kt
@@ -17,7 +17,6 @@
package androidx.compose.runtime.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material.Button
import androidx.compose.material.Text
@@ -27,7 +26,6 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
fun stateSample() {
@Composable
diff --git a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateListSamples.kt b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateListSamples.kt
index 061e7bd..f205107 100644
--- a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateListSamples.kt
+++ b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateListSamples.kt
@@ -17,7 +17,6 @@
package androidx.compose.runtime.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.text.BasicTextField
@@ -30,7 +29,6 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
fun stateListSample() {
@Composable
diff --git a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
index edb222d..76791ca 100644
--- a/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
+++ b/compose/runtime/runtime/samples/src/main/java/androidx/compose/runtime/samples/MutableStateMapSample.kt
@@ -17,7 +17,6 @@
package androidx.compose.runtime.samples
import androidx.annotation.Sampled
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.text.BasicTextField
@@ -30,7 +29,6 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
-@OptIn(ExperimentalFoundationApi::class)
@Sampled
fun stateMapSample() {
@Composable
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ComposeUiTestTest.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ComposeUiTestTest.kt
index eb84f11..4f3089f 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ComposeUiTestTest.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/ComposeUiTestTest.kt
@@ -18,7 +18,6 @@
import androidx.activity.ComponentActivity
import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.LocalOverscrollConfiguration
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.gestures.FlingBehavior
@@ -137,7 +136,6 @@
* Check that scrolling and controlling the clock works: a scrollable receives a swipe while the
* clock is paused, when the clock is resumed it performs the fling.
*/
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun testControlledScrolling() = runComposeUiTest {
// Define constants used in the test
diff --git a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/injectionscope/mouse/ClickTest.kt b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/injectionscope/mouse/ClickTest.kt
index 95776bc..f24d118 100644
--- a/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/injectionscope/mouse/ClickTest.kt
+++ b/compose/ui/ui-test/src/androidInstrumentedTest/kotlin/androidx/compose/ui/test/injectionscope/mouse/ClickTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.test.injectionscope.mouse
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.draggable2D
import androidx.compose.foundation.gestures.rememberDraggable2DState
@@ -346,7 +345,6 @@
var yOffsetPx by mutableStateOf(0f)
setContent {
- @OptIn(ExperimentalFoundationApi::class)
Box(Modifier.padding(16.dp).fillMaxSize()) {
Box(
Modifier.testTag("draggable-box")
diff --git a/compose/ui/ui-test/src/androidUnitTest/kotlin/androidx/compose/ui/test/RobolectricComposeTest.kt b/compose/ui/ui-test/src/androidUnitTest/kotlin/androidx/compose/ui/test/RobolectricComposeTest.kt
index b5253dd..44557cc 100644
--- a/compose/ui/ui-test/src/androidUnitTest/kotlin/androidx/compose/ui/test/RobolectricComposeTest.kt
+++ b/compose/ui/ui-test/src/androidUnitTest/kotlin/androidx/compose/ui/test/RobolectricComposeTest.kt
@@ -21,7 +21,6 @@
import android.view.MotionEvent
import android.view.View
import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.LocalOverscrollConfiguration
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.clickable
@@ -192,7 +191,6 @@
* Check that scrolling and controlling the clock works: a scrollable receives a swipe while the
* clock is paused, when the clock is resumed it performs the fling.
*/
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun testControlledScrolling() = runComposeUiTest {
// Define constants used in the test
diff --git a/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/ModifiersBenchmark.kt b/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/ModifiersBenchmark.kt
index 30dd32e..397040c 100644
--- a/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/ModifiersBenchmark.kt
+++ b/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/ModifiersBenchmark.kt
@@ -18,7 +18,6 @@
package androidx.compose.ui.benchmark
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.IndicationNodeFactory
import androidx.compose.foundation.MutatePriority
import androidx.compose.foundation.border
@@ -85,7 +84,6 @@
* reference it in the modifier lambda so that allocating these isn't included in the
* "recomposition" time.
*/
- @OptIn(ExperimentalFoundationApi::class)
@JvmStatic
@Parameterized.Parameters(name = "{0}_{1}x")
fun data(): Collection<Array<Any>> =
@@ -201,7 +199,6 @@
override fun dispatchRawDelta(delta: Float) {}
}
- @OptIn(ExperimentalFoundationApi::class)
private val draggable2DState =
object : Draggable2DState {
override suspend fun drag(
diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/PopupDemo.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/PopupDemo.kt
index 9c540e6..f3e57a3 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/PopupDemo.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/PopupDemo.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.demos
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -463,7 +462,6 @@
}
@Composable
-@OptIn(ExperimentalFoundationApi::class)
private fun EditLine(
modifier: Modifier = Modifier,
keyboardType: KeyboardType = KeyboardType.Text,
diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/focus/LazyListChildFocusDemos.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/focus/LazyListChildFocusDemos.kt
index ad4e177..a98009f 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/focus/LazyListChildFocusDemos.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/focus/LazyListChildFocusDemos.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.demos.focus
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box
@@ -47,7 +46,6 @@
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch
-@OptIn(ExperimentalFoundationApi::class)
@Preview(widthDp = 200, heightDp = 400)
@Composable
fun LazyListChildFocusDemos() {
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AccessibilityIteratorsTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AccessibilityIteratorsTest.kt
index 20e2c84..a83fb4e8 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AccessibilityIteratorsTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AccessibilityIteratorsTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.rememberScrollState
@@ -448,7 +447,6 @@
return textLayoutResult!!
}
- @OptIn(ExperimentalFoundationApi::class)
private fun textFieldInScroller(): TextLayoutResult {
var textLayoutResult: TextLayoutResult? = null
rule.setContent {
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
index 3c74115..f81ff75 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/AndroidAccessibilityTest.kt
@@ -45,7 +45,6 @@
import android.widget.FrameLayout
import android.widget.LinearLayout
import android.widget.TextView
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.background
@@ -371,7 +370,6 @@
}
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun testCreateAccessibilityNodeInfo_forSecureTextField() {
// Arrange.
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/accessibility/CollectionInfoTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/accessibility/CollectionInfoTest.kt
index 12881f9..a89c96b 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/accessibility/CollectionInfoTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/accessibility/CollectionInfoTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.accessibility
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.size
@@ -450,7 +449,6 @@
// Arrange.
val pageCount = 20
rule.setContentWithAccessibilityEnabled {
- @OptIn(ExperimentalFoundationApi::class)
HorizontalPager(rememberPagerState { pageCount }, Modifier.size(10.dp).testTag(tag)) {}
}
val virtualId = rule.onNodeWithTag(tag).semanticsId
@@ -467,7 +465,6 @@
// Arrange.
val pageCount = 20
rule.setContentWithAccessibilityEnabled {
- @OptIn(ExperimentalFoundationApi::class)
VerticalPager(rememberPagerState { pageCount }, Modifier.size(10.dp).testTag(tag)) {}
}
val virtualId = rule.onNodeWithTag(tag).semanticsId
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/draganddrop/AndroidDragAndDropTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/draganddrop/AndroidDragAndDropTest.kt
index c563826..84c80b10 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/draganddrop/AndroidDragAndDropTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/draganddrop/AndroidDragAndDropTest.kt
@@ -19,7 +19,6 @@
import android.os.Parcel
import android.view.DragEvent
import android.view.ViewGroup
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.draganddrop.dragAndDropTarget
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.offset
@@ -1037,7 +1036,6 @@
val exitOffsets = mutableListOf<Offset>()
val endedOffsets = mutableListOf<Offset>()
- @OptIn(ExperimentalFoundationApi::class)
val modifier =
Modifier.dragAndDropTarget(
target =
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/focus/FocusRestorerTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/focus/FocusRestorerTest.kt
index 07c6f97..48c4a80 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/focus/FocusRestorerTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/focus/FocusRestorerTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.focus
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.focusGroup
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Box
@@ -45,7 +44,6 @@
import org.junit.runner.RunWith
// TODO: Move these tests to foundation after saveFocusedChild and restoreFocusedChild are stable.
-@ExperimentalFoundationApi
@MediumTest
@RunWith(AndroidJUnit4::class)
class FocusRestorerTest {
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/scrollcapture/ScrollCaptureIntegrationTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/scrollcapture/ScrollCaptureIntegrationTest.kt
index 55bc110..4a2f2e5 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/scrollcapture/ScrollCaptureIntegrationTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/scrollcapture/ScrollCaptureIntegrationTest.kt
@@ -16,7 +16,6 @@
package androidx.compose.ui.scrollcapture
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Box
@@ -239,7 +238,6 @@
assertThat(targets.isEmpty())
}
- @OptIn(ExperimentalFoundationApi::class)
@Test
fun capture_LazyColumn_stickyHeadersDisabled_byLayout() =
captureTester.runTest {
diff --git a/tv/tv-foundation/src/androidTest/java/androidx/tv/foundation/lazy/list/LazyCustomKeysTest.kt b/tv/tv-foundation/src/androidTest/java/androidx/tv/foundation/lazy/list/LazyCustomKeysTest.kt
index 00fe9c9..51f3155 100644
--- a/tv/tv-foundation/src/androidTest/java/androidx/tv/foundation/lazy/list/LazyCustomKeysTest.kt
+++ b/tv/tv-foundation/src/androidTest/java/androidx/tv/foundation/lazy/list/LazyCustomKeysTest.kt
@@ -18,7 +18,6 @@
package androidx.tv.foundation.lazy.list
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
@@ -44,7 +43,6 @@
import org.junit.Test
import org.junit.runner.RunWith
-@OptIn(ExperimentalFoundationApi::class)
@MediumTest
@RunWith(AndroidJUnit4::class)
class LazyCustomKeysTest {
diff --git a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/HorizontalPageIndicatorDemo.kt b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/HorizontalPageIndicatorDemo.kt
index fbf3f4d..ba99403 100644
--- a/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/HorizontalPageIndicatorDemo.kt
+++ b/wear/compose/integration-tests/demos/src/main/java/androidx/wear/compose/integration/demos/HorizontalPageIndicatorDemo.kt
@@ -19,7 +19,6 @@
import androidx.compose.animation.core.TweenSpec
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -95,7 +94,6 @@
}
}
-@OptIn(ExperimentalFoundationApi::class)
@Composable
fun PagerWithIndicator(swipeState: SwipeToDismissBoxState) {
val pagesCount = 3
