Skip to content

Commit 690cd9e

Browse files
Android Build Coastguard WorkerGerrit Code Review
Android Build Coastguard Worker
authored and
Gerrit Code Review
committed
Merge "Merge cherrypicks of ['android-review.googlesource.com/3733108'] into androidx-compose-material3-release." into androidx-compose-material3-release
2 parents f82229d + 873a34d commit 690cd9e

File tree

12 files changed

+10657
-1
lines changed

12 files changed

+10657
-1
lines changed

‎compose/material3/material3-adaptive-navigation-suite/api/1.4.0-beta03.txt‎

Lines changed: 143 additions & 0 deletions
Large diffs are not rendered by default.

‎compose/material3/material3-adaptive-navigation-suite/api/res-1.4.0-beta03.txt‎

Whitespace-only changes.

‎compose/material3/material3-adaptive-navigation-suite/api/restricted_1.4.0-beta03.txt‎

Lines changed: 143 additions & 0 deletions
Large diffs are not rendered by default.

‎compose/material3/material3-window-size-class/api/1.4.0-beta03.txt‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Signature format: 4.0
2+
package androidx.compose.material3.windowsizeclass {
3+
4+
public final class AndroidWindowSizeClass_androidKt {
5+
method @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @androidx.compose.runtime.Composable public static androidx.compose.material3.windowsizeclass.WindowSizeClass calculateWindowSizeClass(android.app.Activity activity);
6+
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @androidx.compose.runtime.Composable public static androidx.compose.material3.windowsizeclass.WindowSizeClass calculateWindowSizeClass(android.app.Activity, androidx.compose.runtime.Composer?, int);
7+
}
8+
9+
@SuppressCompatibility @kotlin.RequiresOptIn(message="This material3-window-size-class API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3WindowSizeClassApi {
10+
}
11+
12+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
13+
method @BytecodeOnly public static androidx.compose.material3.windowsizeclass.WindowHeightSizeClass! box-impl(int);
14+
method public operator int compareTo(int other);
15+
method @BytecodeOnly public int compareTo-pav6bQQ(int);
16+
method @BytecodeOnly public static int compareTo-pav6bQQ(int, int);
17+
method @BytecodeOnly public int unbox-impl();
18+
field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
19+
}
20+
21+
public static final class WindowHeightSizeClass.Companion {
22+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> getAllSizeClasses();
23+
method @BytecodeOnly public int getCompact-Pt018CI();
24+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> getDefaultSizeClasses();
25+
method @BytecodeOnly public int getExpanded-Pt018CI();
26+
method @BytecodeOnly public int getMedium-Pt018CI();
27+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> AllSizeClasses;
28+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Compact;
29+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> DefaultSizeClasses;
30+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Expanded;
31+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Medium;
32+
}
33+
34+
@androidx.compose.runtime.Immutable public final class WindowSizeClass {
35+
method @BytecodeOnly public int getHeightSizeClass-Pt018CI();
36+
method @BytecodeOnly public int getWidthSizeClass-Y0FxcvE();
37+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass heightSizeClass;
38+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass widthSizeClass;
39+
field public static final androidx.compose.material3.windowsizeclass.WindowSizeClass.Companion Companion;
40+
}
41+
42+
public static final class WindowSizeClass.Companion {
43+
method @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi public androidx.compose.material3.windowsizeclass.WindowSizeClass calculateFromSize(long size, optional java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> supportedWidthSizeClasses, optional java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> supportedHeightSizeClasses);
44+
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi public androidx.compose.material3.windowsizeclass.WindowSizeClass calculateFromSize-qzXmJYc(long, java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass!>, java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass!>);
45+
}
46+
47+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowWidthSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> {
48+
method @BytecodeOnly public static androidx.compose.material3.windowsizeclass.WindowWidthSizeClass! box-impl(int);
49+
method public operator int compareTo(int other);
50+
method @BytecodeOnly public int compareTo-GxU_lZo(int);
51+
method @BytecodeOnly public static int compareTo-GxU_lZo(int, int);
52+
method @BytecodeOnly public int unbox-impl();
53+
field public static final androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companion Companion;
54+
}
55+
56+
public static final class WindowWidthSizeClass.Companion {
57+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> getAllSizeClasses();
58+
method @BytecodeOnly public int getCompact-Y0FxcvE();
59+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> getDefaultSizeClasses();
60+
method @BytecodeOnly public int getExpanded-Y0FxcvE();
61+
method @BytecodeOnly public int getMedium-Y0FxcvE();
62+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> AllSizeClasses;
63+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Compact;
64+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> DefaultSizeClasses;
65+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Expanded;
66+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Medium;
67+
}
68+
69+
}
70+

‎compose/material3/material3-window-size-class/api/res-1.4.0-beta03.txt‎

Whitespace-only changes.

‎compose/material3/material3-window-size-class/api/restricted_1.4.0-beta03.txt‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Signature format: 4.0
2+
package androidx.compose.material3.windowsizeclass {
3+
4+
public final class AndroidWindowSizeClass_androidKt {
5+
method @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @androidx.compose.runtime.Composable public static androidx.compose.material3.windowsizeclass.WindowSizeClass calculateWindowSizeClass(android.app.Activity activity);
6+
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi @androidx.compose.runtime.Composable public static androidx.compose.material3.windowsizeclass.WindowSizeClass calculateWindowSizeClass(android.app.Activity, androidx.compose.runtime.Composer?, int);
7+
}
8+
9+
@SuppressCompatibility @kotlin.RequiresOptIn(message="This material3-window-size-class API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalMaterial3WindowSizeClassApi {
10+
}
11+
12+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowHeightSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> {
13+
method @BytecodeOnly public static androidx.compose.material3.windowsizeclass.WindowHeightSizeClass! box-impl(int);
14+
method public operator int compareTo(int other);
15+
method @BytecodeOnly public int compareTo-pav6bQQ(int);
16+
method @BytecodeOnly public static int compareTo-pav6bQQ(int, int);
17+
method @BytecodeOnly public int unbox-impl();
18+
field public static final androidx.compose.material3.windowsizeclass.WindowHeightSizeClass.Companion Companion;
19+
}
20+
21+
public static final class WindowHeightSizeClass.Companion {
22+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> getAllSizeClasses();
23+
method @BytecodeOnly public int getCompact-Pt018CI();
24+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> getDefaultSizeClasses();
25+
method @BytecodeOnly public int getExpanded-Pt018CI();
26+
method @BytecodeOnly public int getMedium-Pt018CI();
27+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> AllSizeClasses;
28+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Compact;
29+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> DefaultSizeClasses;
30+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Expanded;
31+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass Medium;
32+
}
33+
34+
@androidx.compose.runtime.Immutable public final class WindowSizeClass {
35+
method @BytecodeOnly public int getHeightSizeClass-Pt018CI();
36+
method @BytecodeOnly public int getWidthSizeClass-Y0FxcvE();
37+
property public androidx.compose.material3.windowsizeclass.WindowHeightSizeClass heightSizeClass;
38+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass widthSizeClass;
39+
field public static final androidx.compose.material3.windowsizeclass.WindowSizeClass.Companion Companion;
40+
}
41+
42+
public static final class WindowSizeClass.Companion {
43+
method @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi public androidx.compose.material3.windowsizeclass.WindowSizeClass calculateFromSize(long size, optional java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> supportedWidthSizeClasses, optional java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass> supportedHeightSizeClasses);
44+
method @BytecodeOnly @SuppressCompatibility @androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi public androidx.compose.material3.windowsizeclass.WindowSizeClass calculateFromSize-qzXmJYc(long, java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass!>, java.util.Set<androidx.compose.material3.windowsizeclass.WindowHeightSizeClass!>);
45+
}
46+
47+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class WindowWidthSizeClass implements java.lang.Comparable<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> {
48+
method @BytecodeOnly public static androidx.compose.material3.windowsizeclass.WindowWidthSizeClass! box-impl(int);
49+
method public operator int compareTo(int other);
50+
method @BytecodeOnly public int compareTo-GxU_lZo(int);
51+
method @BytecodeOnly public static int compareTo-GxU_lZo(int, int);
52+
method @BytecodeOnly public int unbox-impl();
53+
field public static final androidx.compose.material3.windowsizeclass.WindowWidthSizeClass.Companion Companion;
54+
}
55+
56+
public static final class WindowWidthSizeClass.Companion {
57+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> getAllSizeClasses();
58+
method @BytecodeOnly public int getCompact-Y0FxcvE();
59+
method public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> getDefaultSizeClasses();
60+
method @BytecodeOnly public int getExpanded-Y0FxcvE();
61+
method @BytecodeOnly public int getMedium-Y0FxcvE();
62+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> AllSizeClasses;
63+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Compact;
64+
property public java.util.Set<androidx.compose.material3.windowsizeclass.WindowWidthSizeClass> DefaultSizeClasses;
65+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Expanded;
66+
property public androidx.compose.material3.windowsizeclass.WindowWidthSizeClass Medium;
67+
}
68+
69+
}
70+

0 commit comments

Comments
 (0)