Skip to content

[Cherry-pick] All Material 3 Adaptive changes up to 1.2.0-rc01 #2508

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
merged 11 commits into from
Oct 22, 2025
Merged

[Cherry-pick] All Material 3 Adaptive changes up to 1.2.0-rc01 #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b718dc
Copy compose-material3-adaptive from fbc68d26017 (without build scrip…
MatkovIvan Aug 21, 2025
34e9f37
Fix adaptive-layout string indexes (#2362)
MatkovIvan Aug 28, 2025
a333594
Copy compose-material3-adaptive from cd19b04cdfe (without stubs, grad…
MatkovIvan Sep 16, 2025
eb7672d
Update translations
MatkovIvan Sep 16, 2025
e12f6ec
Copy compose-material3-adaptive from 993cbbf95ba (without API dumps, …
MatkovIvan Sep 30, 2025
3ef0b59
Copy compose-material3-adaptive from 0afce5d9676 (without build scrip…
MatkovIvan Oct 10, 2025
1769d16
Fix actuals after aosp/3780226: Set default a11y pane title to Animat…
MatkovIvan Oct 9, 2025
20c39fc
Pin material3.adaptive to compose 1.9.0 (#2475)
ASalavei Oct 13, 2025
5a16a21
Fix recursion due to vararg overload (#2497)
MatkovIvan Oct 17, 2025
921c603
Update API dumps
MatkovIvan Oct 22, 2025
e9866e8
Update artifact redirection versions
MatkovIvan Oct 22, 2025
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
135 changes: 53 additions & 82 deletions compose/material3/adaptive/adaptive-layout/api/adaptive-layout.klib.api
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions compose/material3/adaptive/adaptive-layout/api/api_lint.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Baseline format: 1.0
TypeParameterName: androidx.compose.material3.adaptive.layout.AnimatedPaneOverride#AnimatedPane(androidx.compose.material3.adaptive.layout.AnimatedPaneOverrideScope<Role,ScaffoldValue>):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.AnimatedPaneOverrideScope:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldPaneScope:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldScope:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneKt#AnimatedPane(androidx.compose.material3.adaptive.layout.ExtendedPaneScaffoldPaneScope<Role,ScaffoldValue>, androidx.compose.ui.Modifier, androidx.compose.animation.EnterTransition, androidx.compose.animation.ExitTransition, androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntRect>, kotlin.jvm.functions.Function1<androidx.compose.material3.adaptive.layout.AnimatedPaneScope,kotlin.Unit>):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#calculateDefaultEnterTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, Role):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#calculateDefaultExitTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, Role):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#forEach(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, kotlin.jvm.functions.Function2<? super Role,? super androidx.compose.material3.adaptive.layout.PaneMotionData,kotlin.Unit>):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneMotionKt#forEachReversed(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider<Role>, kotlin.jvm.functions.Function2<? super Role,? super androidx.compose.material3.adaptive.layout.PaneMotionData,kotlin.Unit>):
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldHorizontalOrder:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldMotionDataProvider:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldPaneScope:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldTransitionScope:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
TypeParameterName: androidx.compose.material3.adaptive.layout.PaneScaffoldValue:
Invalid type parameter name "Role". Type parameter names must follow the Google naming guidelines specified here: https://developer.android.com/kotlin/style-guide#type_variable_names
36 changes: 4 additions & 32 deletions compose/material3/adaptive/adaptive-layout/api/current.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
// Baseline format: 1.0
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#getSaveableStateHolder():
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.getSaveableStateHolder()
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#paneExpansionDraggable-TDGSqEk(androidx.compose.ui.Modifier, androidx.compose.material3.adaptive.layout.PaneExpansionState, float, androidx.compose.foundation.interaction.MutableInteractionSource, kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.paneExpansionDraggable-TDGSqEk(androidx.compose.ui.Modifier,androidx.compose.material3.adaptive.layout.PaneExpansionState,float,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.jvm.functions.Function1<? super androidx.compose.ui.semantics.SemanticsPropertyReceiver,kotlin.Unit>)
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight(androidx.compose.ui.Modifier, float):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight(androidx.compose.ui.Modifier,float)
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight(androidx.compose.ui.Modifier, int):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight(androidx.compose.ui.Modifier,int)
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredHeight-3ABfNKs(androidx.compose.ui.Modifier, float):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredHeight-3ABfNKs(androidx.compose.ui.Modifier,float)
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredWidth(androidx.compose.ui.Modifier, int):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredWidth(androidx.compose.ui.Modifier,int)
AddedAbstractMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldScope#preferredWidth-3ABfNKs(androidx.compose.ui.Modifier, float):
Binary breaking change: Added method androidx.compose.material3.adaptive.layout.PaneScaffoldScope.preferredWidth-3ABfNKs(androidx.compose.ui.Modifier,float)


RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAlwaysAvoid():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAlwaysAvoid()
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAvoidOccluding():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAvoidOccluding()
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getAvoidSeparating():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getAvoidSeparating()
RemovedMethod: androidx.compose.material3.adaptive.layout.HingePolicy.Companion#getNeverAvoid():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.HingePolicy.Companion.getNeverAvoid()
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#PaneScaffoldDirective(int, float, int, float, float, java.util.List<androidx.compose.ui.geometry.Rect>):
Binary breaking change: Removed constructor androidx.compose.material3.adaptive.layout.PaneScaffoldDirective(int,float,int,float,float,java.util.List<androidx.compose.ui.geometry.Rect>)
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getDefaultPanePreferredWidth():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getDefaultPanePreferredWidth()
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getHorizontalPartitionSpacerSize():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getHorizontalPartitionSpacerSize()
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneScaffoldDirective#getVerticalPartitionSpacerSize():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneScaffoldDirective.getVerticalPartitionSpacerSize()
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneExpansionAnchor#getDescription():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.getDescription()
RemovedMethod: androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.Proportion#getDescription():
Binary breaking change: Removed method androidx.compose.material3.adaptive.layout.PaneExpansionAnchor.Proportion.getDescription()
Loading