Skip to content

Commit f37f2d0

Browse files
eymareymar
authored
Merge Jetpack Compose Material3 1.5.0-alpha13 (#2727)
| GroupId | ReleaseVersion | ReleaseSHA | ReleaseBuildId | ReleaseDate | | :---- | :---- | :---- | :---- | :---- | | androidx.compose.material3 | 1.5.0-alpha13 | c26c6f0 | 14759867 | 1/28/2026 | Fixes https://youtrack.jetbrains.com/issue/CMP-9683 ## Testing N/A ## Release Notes N/A
2 parents 504babc + 902e0c8 commit f37f2d0

File tree

50 files changed

+1630
-675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1630
-675
lines changed

‎compose/material3/benchmark/src/androidTest/java/androidx/compose/material3/benchmark/TooltipBenchmark.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package androidx.compose.material3.benchmark
1818

19-
import androidx.compose.material3.ExperimentalMaterial3Api
2019
import androidx.compose.material3.MaterialTheme
2120
import androidx.compose.material3.PlainTooltip
2221
import androidx.compose.material3.RichTooltip
@@ -74,7 +73,6 @@ class TooltipBenchmark {
7473
}
7574
}
7675

77-
@OptIn(ExperimentalMaterial3Api::class)
7876
private class TooltipTestCase(val tooltipType: TooltipType) :
7977
LayeredComposeTestCase(), ToggleableTestCase {
8078
private lateinit var state: TooltipState

‎compose/material3/integration-tests/macrobenchmark-target/proguard-rules.pro‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
-dontobfuscate
2+
-assumevalues public class androidx.compose.runtime.ComposeRuntimeFlags {
3+
static boolean isLinkBufferComposerEnabled return false;
4+
}

‎compose/material3/material3/api/current.ignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,3 +1075,7 @@ RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshDefaults#In
10751075
Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshDefaults.IndicatorBox(androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,androidx.compose.ui.Modifier,float,androidx.compose.ui.graphics.Shape,long,float,kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit>)
10761076
RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshKt#pullToRefresh(androidx.compose.ui.Modifier, boolean, androidx.compose.material3.pulltorefresh.PullToRefreshState, boolean, float, kotlin.jvm.functions.Function0<kotlin.Unit>):
10771077
Binary breaking change: Removed method androidx.compose.material3.pulltorefresh.PullToRefreshKt.pullToRefresh(androidx.compose.ui.Modifier,boolean,androidx.compose.material3.pulltorefresh.PullToRefreshState,boolean,float,kotlin.jvm.functions.Function0<kotlin.Unit>)
1078+
1079+
1080+
RemovedProperty: androidx.compose.material3.AppBarMenuState#isExpanded:
1081+
Source breaking change: Removed property androidx.compose.material3.AppBarMenuState#isExpanded

‎compose/material3/material3/api/current.txt‎

Lines changed: 22 additions & 18 deletions
Large diffs are not rendered by default.

‎compose/material3/material3/api/desktop/material3.api‎

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ public final class androidx/compose/material3/ComposableSingletons$SearchBarKt {
478478
public static final field INSTANCE Landroidx/compose/material3/ComposableSingletons$SearchBarKt;
479479
public fun <init> ()V
480480
public final fun getLambda$1165377840$material3 ()Lkotlin/jvm/functions/Function2;
481-
public final fun getLambda$549402172$material3 ()Lkotlin/jvm/functions/Function2;
481+
public final fun getLambda$1464724888$material3 ()Lkotlin/jvm/functions/Function2;
482482
}
483483

484484
public final class androidx/compose/material3/ComposableSingletons$SegmentedButtonKt {
@@ -633,6 +633,14 @@ public abstract interface class androidx/compose/material3/DateRangePickerState
633633
public abstract fun setSelection (Ljava/lang/Long;Ljava/lang/Long;)V
634634
}
635635

636+
public final class androidx/compose/material3/DefaultTooltipCaretShape : androidx/compose/ui/graphics/Shape {
637+
public static final field $stable I
638+
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
639+
public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
640+
public fun createOutline-Pq9zytI (JLandroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/Density;)Landroidx/compose/ui/graphics/Outline;
641+
public final fun getCaretSize-MYxV2XQ ()J
642+
}
643+
636644
public final class androidx/compose/material3/DisplayMode {
637645
public static final field Companion Landroidx/compose/material3/DisplayMode$Companion;
638646
public static final synthetic fun box-impl (I)Landroidx/compose/material3/DisplayMode;
@@ -1362,6 +1370,19 @@ public final class androidx/compose/material3/RangeSliderState$Companion {
13621370
public final fun Saver (Lkotlin/jvm/functions/Function0;Lkotlin/ranges/ClosedFloatingPointRange;)Landroidx/compose/runtime/saveable/Saver;
13631371
}
13641372

1373+
public final class androidx/compose/material3/RichTooltipColors {
1374+
public static final field $stable I
1375+
public synthetic fun <init> (JJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
1376+
public final fun copy-jRlVdoo (JJJJ)Landroidx/compose/material3/RichTooltipColors;
1377+
public static synthetic fun copy-jRlVdoo$default (Landroidx/compose/material3/RichTooltipColors;JJJJILjava/lang/Object;)Landroidx/compose/material3/RichTooltipColors;
1378+
public fun equals (Ljava/lang/Object;)Z
1379+
public final fun getActionContentColor-0d7_KjU ()J
1380+
public final fun getContainerColor-0d7_KjU ()J
1381+
public final fun getContentColor-0d7_KjU ()J
1382+
public final fun getTitleContentColor-0d7_KjU ()J
1383+
public fun hashCode ()I
1384+
}
1385+
13651386
public final class androidx/compose/material3/RippleConfiguration {
13661387
public static final field $stable I
13671388
public synthetic fun <init> (JLandroidx/compose/material/ripple/RippleAlpha;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -1399,6 +1420,7 @@ public final class androidx/compose/material3/ScaffoldKt {
13991420

14001421
public final class androidx/compose/material3/SearchBarState$Companion {
14011422
public final fun Saver (Landroidx/compose/animation/core/AnimationSpec;Landroidx/compose/animation/core/AnimationSpec;)Landroidx/compose/runtime/saveable/Saver;
1423+
public final fun Saver (Landroidx/compose/animation/core/AnimationSpec;Landroidx/compose/animation/core/AnimationSpec;Landroidx/compose/animation/core/AnimationSpec;Landroidx/compose/animation/core/AnimationSpec;)Landroidx/compose/runtime/saveable/Saver;
14021424
}
14031425

14041426
public final class androidx/compose/material3/SecureTextFieldKt {
@@ -2065,6 +2087,19 @@ public final class androidx/compose/material3/ToggleButtonColors {
20652087
public fun hashCode ()I
20662088
}
20672089

2090+
public final class androidx/compose/material3/TooltipAnchorPosition {
2091+
public static final field Companion Landroidx/compose/material3/TooltipAnchorPosition$Companion;
2092+
public static final synthetic fun box-impl (I)Landroidx/compose/material3/TooltipAnchorPosition;
2093+
public fun equals (Ljava/lang/Object;)Z
2094+
public static fun equals-impl (ILjava/lang/Object;)Z
2095+
public static final fun equals-impl0 (II)Z
2096+
public fun hashCode ()I
2097+
public static fun hashCode-impl (I)I
2098+
public fun toString ()Ljava/lang/String;
2099+
public static fun toString-impl (I)Ljava/lang/String;
2100+
public final synthetic fun unbox-impl ()I
2101+
}
2102+
20682103
public final class androidx/compose/material3/TooltipAnchorPosition$Companion {
20692104
public final fun getAbove-lOKsHw4 ()I
20702105
public final fun getBelow-lOKsHw4 ()I
@@ -2074,6 +2109,52 @@ public final class androidx/compose/material3/TooltipAnchorPosition$Companion {
20742109
public final fun getStart-lOKsHw4 ()I
20752110
}
20762111

2112+
public final class androidx/compose/material3/TooltipDefaults {
2113+
public static final field $stable I
2114+
public static final field INSTANCE Landroidx/compose/material3/TooltipDefaults;
2115+
public final fun caretShape ()Landroidx/compose/material3/DefaultTooltipCaretShape;
2116+
public final fun caretShape-EaSLcWc (J)Landroidx/compose/ui/graphics/Shape;
2117+
public static synthetic fun caretShape-EaSLcWc$default (Landroidx/compose/material3/TooltipDefaults;JILjava/lang/Object;)Landroidx/compose/ui/graphics/Shape;
2118+
public final fun getCaretSize-MYxV2XQ ()J
2119+
public final fun getPlainTooltipContainerColor (Landroidx/compose/runtime/Composer;I)J
2120+
public final fun getPlainTooltipContainerShape (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/graphics/Shape;
2121+
public final fun getPlainTooltipContentColor (Landroidx/compose/runtime/Composer;I)J
2122+
public final fun getPlainTooltipMaxWidth-D9Ej5fM ()F
2123+
public final fun getRichTooltipContainerShape (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/graphics/Shape;
2124+
public final fun getRichTooltipMaxWidth-D9Ej5fM ()F
2125+
public final fun rememberPlainTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
2126+
public final fun rememberRichTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
2127+
public final fun rememberTooltipPositionProvider-Hu5FAss (IFLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
2128+
public final fun rememberTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
2129+
public final fun richTooltipColors (Landroidx/compose/runtime/Composer;I)Landroidx/compose/material3/RichTooltipColors;
2130+
public final fun richTooltipColors-ro_MJ88 (JJJJLandroidx/compose/runtime/Composer;II)Landroidx/compose/material3/RichTooltipColors;
2131+
}
2132+
2133+
public final class androidx/compose/material3/TooltipKt {
2134+
public static final fun PlainTooltip-gv3ox5I (Landroidx/compose/material3/TooltipScope;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/graphics/Shape;FLandroidx/compose/ui/graphics/Shape;JJFFLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
2135+
public static final fun RichTooltip-EkvW5A0 (Landroidx/compose/material3/TooltipScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Landroidx/compose/ui/graphics/Shape;FLandroidx/compose/ui/graphics/Shape;Landroidx/compose/material3/RichTooltipColors;FFLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V
2136+
public static final fun TooltipBox (Landroidx/compose/ui/window/PopupPositionProvider;Lkotlin/jvm/functions/Function3;Landroidx/compose/material3/TooltipState;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function0;ZZZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
2137+
public static final fun TooltipState (ZZLandroidx/compose/foundation/MutatorMutex;)Landroidx/compose/material3/TooltipState;
2138+
public static synthetic fun TooltipState$default (ZZLandroidx/compose/foundation/MutatorMutex;ILjava/lang/Object;)Landroidx/compose/material3/TooltipState;
2139+
public static final fun rememberTooltipState (ZZLandroidx/compose/foundation/MutatorMutex;Landroidx/compose/runtime/Composer;II)Landroidx/compose/material3/TooltipState;
2140+
}
2141+
2142+
public abstract interface class androidx/compose/material3/TooltipScope {
2143+
public abstract synthetic fun drawCaret (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;)Landroidx/compose/ui/Modifier;
2144+
public abstract fun obtainAnchorBounds (Landroidx/compose/ui/layout/MeasureScope;)Landroidx/compose/ui/layout/LayoutCoordinates;
2145+
public abstract fun obtainPositionProvider ()Landroidx/compose/ui/window/PopupPositionProvider;
2146+
}
2147+
2148+
public abstract interface class androidx/compose/material3/TooltipState {
2149+
public abstract fun dismiss ()V
2150+
public abstract fun getTransition ()Landroidx/compose/animation/core/MutableTransitionState;
2151+
public abstract fun isPersistent ()Z
2152+
public abstract fun isVisible ()Z
2153+
public abstract fun onDispose ()V
2154+
public abstract fun show (Landroidx/compose/foundation/MutatePriority;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2155+
public static synthetic fun show$default (Landroidx/compose/material3/TooltipState;Landroidx/compose/foundation/MutatePriority;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2156+
}
2157+
20772158
public final class androidx/compose/material3/TopAppBarColors {
20782159
public static final field $stable I
20792160
public synthetic fun <init> (JJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V

0 commit comments

Comments
 (0)