Skip to content

Merge Jetpack Compose Material3 1.5.0-alpha13 #2727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eymar merged 4 commits into from
Jan 29, 2026
+1,630 −675
Merged

Merge Jetpack Compose Material3 1.5.0-alpha13 #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06bf04c
Copy compose-material3 from b968bdbca9d
eymar Jan 29, 2026
d3d46e0
bump artifactRedirection for material3 to 1.5.0-alpha13
eymar Jan 29, 2026
b6e5414
update material3 api dump
eymar Jan 29, 2026
902e0c8
Add a TODO for rememberTimeInputErrorHandler (CMP-9703)
eymar Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...3/benchmark/src/androidTest/java/androidx/compose/material3/benchmark/TooltipBenchmark.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package androidx.compose.material3.benchmark

import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.PlainTooltip
import androidx.compose.material3.RichTooltip
Expand Down Expand Up @@ -74,7 +73,6 @@ class TooltipBenchmark {
}
}

@OptIn(ExperimentalMaterial3Api::class)
private class TooltipTestCase(val tooltipType: TooltipType) :
LayeredComposeTestCase(), ToggleableTestCase {
private lateinit var state: TooltipState
Expand Down
3 changes: 3 additions & 0 deletions compose/material3/integration-tests/macrobenchmark-target/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
-dontobfuscate
-assumevalues public class androidx.compose.runtime.ComposeRuntimeFlags {
static boolean isLinkBufferComposerEnabled return false;
}
4 changes: 4 additions & 0 deletions compose/material3/material3/api/current.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,3 +1075,7 @@ RemovedMethod: androidx.compose.material3.pulltorefresh.PullToRefreshDefaults#In
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>)
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>):
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>)


RemovedProperty: androidx.compose.material3.AppBarMenuState#isExpanded:
Source breaking change: Removed property androidx.compose.material3.AppBarMenuState#isExpanded
40 changes: 22 additions & 18 deletions compose/material3/material3/api/current.txt
View file
Open in desktop

Large diffs are not rendered by default.

83 changes: 82 additions & 1 deletion compose/material3/material3/api/desktop/material3.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ public final class androidx/compose/material3/ComposableSingletons$SearchBarKt {
public static final field INSTANCE Landroidx/compose/material3/ComposableSingletons$SearchBarKt;
public fun <init> ()V
public final fun getLambda$1165377840$material3 ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$549402172$material3 ()Lkotlin/jvm/functions/Function2;
public final fun getLambda$1464724888$material3 ()Lkotlin/jvm/functions/Function2;
}

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

public final class androidx/compose/material3/DefaultTooltipCaretShape : androidx/compose/ui/graphics/Shape {
public static final field $stable I
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (JLkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun createOutline-Pq9zytI (JLandroidx/compose/ui/unit/LayoutDirection;Landroidx/compose/ui/unit/Density;)Landroidx/compose/ui/graphics/Outline;
public final fun getCaretSize-MYxV2XQ ()J
}

public final class androidx/compose/material3/DisplayMode {
public static final field Companion Landroidx/compose/material3/DisplayMode$Companion;
public static final synthetic fun box-impl (I)Landroidx/compose/material3/DisplayMode;
Expand Down Expand Up @@ -1362,6 +1370,19 @@ public final class androidx/compose/material3/RangeSliderState$Companion {
public final fun Saver (Lkotlin/jvm/functions/Function0;Lkotlin/ranges/ClosedFloatingPointRange;)Landroidx/compose/runtime/saveable/Saver;
}

public final class androidx/compose/material3/RichTooltipColors {
public static final field $stable I
public synthetic fun <init> (JJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun copy-jRlVdoo (JJJJ)Landroidx/compose/material3/RichTooltipColors;
public static synthetic fun copy-jRlVdoo$default (Landroidx/compose/material3/RichTooltipColors;JJJJILjava/lang/Object;)Landroidx/compose/material3/RichTooltipColors;
public fun equals (Ljava/lang/Object;)Z
public final fun getActionContentColor-0d7_KjU ()J
public final fun getContainerColor-0d7_KjU ()J
public final fun getContentColor-0d7_KjU ()J
public final fun getTitleContentColor-0d7_KjU ()J
public fun hashCode ()I
}

public final class androidx/compose/material3/RippleConfiguration {
public static final field $stable I
public synthetic fun <init> (JLandroidx/compose/material/ripple/RippleAlpha;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
Expand Down Expand Up @@ -1399,6 +1420,7 @@ public final class androidx/compose/material3/ScaffoldKt {

public final class androidx/compose/material3/SearchBarState$Companion {
public final fun Saver (Landroidx/compose/animation/core/AnimationSpec;Landroidx/compose/animation/core/AnimationSpec;)Landroidx/compose/runtime/saveable/Saver;
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;
}

public final class androidx/compose/material3/SecureTextFieldKt {
Expand Down Expand Up @@ -2065,6 +2087,19 @@ public final class androidx/compose/material3/ToggleButtonColors {
public fun hashCode ()I
}

public final class androidx/compose/material3/TooltipAnchorPosition {
public static final field Companion Landroidx/compose/material3/TooltipAnchorPosition$Companion;
public static final synthetic fun box-impl (I)Landroidx/compose/material3/TooltipAnchorPosition;
public fun equals (Ljava/lang/Object;)Z
public static fun equals-impl (ILjava/lang/Object;)Z
public static final fun equals-impl0 (II)Z
public fun hashCode ()I
public static fun hashCode-impl (I)I
public fun toString ()Ljava/lang/String;
public static fun toString-impl (I)Ljava/lang/String;
public final synthetic fun unbox-impl ()I
}

public final class androidx/compose/material3/TooltipAnchorPosition$Companion {
public final fun getAbove-lOKsHw4 ()I
public final fun getBelow-lOKsHw4 ()I
Expand All @@ -2074,6 +2109,52 @@ public final class androidx/compose/material3/TooltipAnchorPosition$Companion {
public final fun getStart-lOKsHw4 ()I
}

public final class androidx/compose/material3/TooltipDefaults {
public static final field $stable I
public static final field INSTANCE Landroidx/compose/material3/TooltipDefaults;
public final fun caretShape ()Landroidx/compose/material3/DefaultTooltipCaretShape;
public final fun caretShape-EaSLcWc (J)Landroidx/compose/ui/graphics/Shape;
public static synthetic fun caretShape-EaSLcWc$default (Landroidx/compose/material3/TooltipDefaults;JILjava/lang/Object;)Landroidx/compose/ui/graphics/Shape;
public final fun getCaretSize-MYxV2XQ ()J
public final fun getPlainTooltipContainerColor (Landroidx/compose/runtime/Composer;I)J
public final fun getPlainTooltipContainerShape (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/graphics/Shape;
public final fun getPlainTooltipContentColor (Landroidx/compose/runtime/Composer;I)J
public final fun getPlainTooltipMaxWidth-D9Ej5fM ()F
public final fun getRichTooltipContainerShape (Landroidx/compose/runtime/Composer;I)Landroidx/compose/ui/graphics/Shape;
public final fun getRichTooltipMaxWidth-D9Ej5fM ()F
public final fun rememberPlainTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
public final fun rememberRichTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
public final fun rememberTooltipPositionProvider-Hu5FAss (IFLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
public final fun rememberTooltipPositionProvider-kHDZbjc (FLandroidx/compose/runtime/Composer;II)Landroidx/compose/ui/window/PopupPositionProvider;
public final fun richTooltipColors (Landroidx/compose/runtime/Composer;I)Landroidx/compose/material3/RichTooltipColors;
public final fun richTooltipColors-ro_MJ88 (JJJJLandroidx/compose/runtime/Composer;II)Landroidx/compose/material3/RichTooltipColors;
}

public final class androidx/compose/material3/TooltipKt {
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
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
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
public static final fun TooltipState (ZZLandroidx/compose/foundation/MutatorMutex;)Landroidx/compose/material3/TooltipState;
public static synthetic fun TooltipState$default (ZZLandroidx/compose/foundation/MutatorMutex;ILjava/lang/Object;)Landroidx/compose/material3/TooltipState;
public static final fun rememberTooltipState (ZZLandroidx/compose/foundation/MutatorMutex;Landroidx/compose/runtime/Composer;II)Landroidx/compose/material3/TooltipState;
}

public abstract interface class androidx/compose/material3/TooltipScope {
public abstract synthetic fun drawCaret (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;)Landroidx/compose/ui/Modifier;
public abstract fun obtainAnchorBounds (Landroidx/compose/ui/layout/MeasureScope;)Landroidx/compose/ui/layout/LayoutCoordinates;
public abstract fun obtainPositionProvider ()Landroidx/compose/ui/window/PopupPositionProvider;
}

public abstract interface class androidx/compose/material3/TooltipState {
public abstract fun dismiss ()V
public abstract fun getTransition ()Landroidx/compose/animation/core/MutableTransitionState;
public abstract fun isPersistent ()Z
public abstract fun isVisible ()Z
public abstract fun onDispose ()V
public abstract fun show (Landroidx/compose/foundation/MutatePriority;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public static synthetic fun show$default (Landroidx/compose/material3/TooltipState;Landroidx/compose/foundation/MutatePriority;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
}

public final class androidx/compose/material3/TopAppBarColors {
public static final field $stable I
public synthetic fun <init> (JJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
Expand Down
Loading