Merge "Opt-in n- thru t-prefixed projects to Suppress Compatibility migration" into androidx-main am: ed9751b8dd

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2587749

Change-Id: I5400072464fb831b821f385dd80e960ddd7d2d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/gradle.properties b/gradle.properties
index 0eeb509..2e2483f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,8 +49,8 @@
 androidx.suppress.compatibility.optin.hijklm=h,i,j,k,l,m
 
 # Fourth stage of Suppress Compatibility migration
-androidx.suppress.compatibility.optout.nopqrst=navigation/navigation-ui/
-# androidx.suppress.compatibility.optin.nopqrst=n,o,p,q,r,s,t
+androidx.suppress.compatibility.optout.nopqrst=navigation/navigation-ui/,privacysandbox/ads/ads-adservices/,privacysandbox/sdkruntime/sdkruntime-client/,privacysandbox/sdkruntime/sdkruntime-core/,privacysandbox/ui/ui-client/,privacysandbox/ui/ui-core/,privacysandbox/ui/ui-provider/,transition/transition/
+androidx.suppress.compatibility.optin.nopqrst=n,o,p,q,r,s,t
 
 # Fifth stage of Suppress Compatibility migration
 androidx.suppress.compatibility.optout.uvwxyz=wear/compose/compose-foundation/,wear/protolayout/protolayout-expression/,wear/protolayout/protolayout-material/,wear/watchface/watchface-client/,window/window/,window/window-java/,window/extensions/extensions/,work/work-datatransfer/
diff --git a/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/navigation/navigation-common-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/navigation/navigation-common/api/public_plus_experimental_current.txt b/navigation/navigation-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index 51a77a6..0000000
--- a/navigation/navigation-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,530 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation {
-
-  public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
-    ctor public ActionOnlyNavDirections(int actionId);
-    method public int component1();
-    method public androidx.navigation.ActionOnlyNavDirections copy(int actionId);
-    method public int getActionId();
-    method public android.os.Bundle getArguments();
-    property public int actionId;
-    property public android.os.Bundle arguments;
-  }
-
-  @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
-    ctor public AnimBuilder();
-    method public int getEnter();
-    method public int getExit();
-    method public int getPopEnter();
-    method public int getPopExit();
-    method public void setEnter(int);
-    method public void setExit(int);
-    method public void setPopEnter(int);
-    method public void setPopExit(int);
-    property public final int enter;
-    property public final int exit;
-    property public final int popEnter;
-    property public final int popExit;
-  }
-
-  public interface FloatingWindow {
-  }
-
-  public final class NamedNavArgument {
-    method public operator String component1();
-    method public operator androidx.navigation.NavArgument component2();
-    method public androidx.navigation.NavArgument getArgument();
-    method public String getName();
-    property public final androidx.navigation.NavArgument argument;
-    property public final String name;
-  }
-
-  public final class NamedNavArgumentKt {
-    method public static androidx.navigation.NamedNavArgument navArgument(String name, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavAction {
-    ctor public NavAction(@IdRes int destinationId);
-    ctor public NavAction(@IdRes int destinationId, optional androidx.navigation.NavOptions? navOptions);
-    ctor public NavAction(@IdRes int destinationId, optional androidx.navigation.NavOptions? navOptions, optional android.os.Bundle? defaultArguments);
-    method public android.os.Bundle? getDefaultArguments();
-    method public int getDestinationId();
-    method public androidx.navigation.NavOptions? getNavOptions();
-    method public void setDefaultArguments(android.os.Bundle?);
-    method public void setNavOptions(androidx.navigation.NavOptions?);
-    property public final android.os.Bundle? defaultArguments;
-    property public final int destinationId;
-    property public final androidx.navigation.NavOptions? navOptions;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class NavActionBuilder {
-    ctor public NavActionBuilder();
-    method public java.util.Map<java.lang.String,java.lang.Object> getDefaultArguments();
-    method public int getDestinationId();
-    method public void navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
-    method public void setDestinationId(int);
-    property public final java.util.Map<java.lang.String,java.lang.Object> defaultArguments;
-    property public final int destinationId;
-  }
-
-  public interface NavArgs {
-  }
-
-  public final class NavArgsLazy<Args extends androidx.navigation.NavArgs> implements kotlin.Lazy<Args> {
-    ctor public NavArgsLazy(kotlin.reflect.KClass<Args> navArgsClass, kotlin.jvm.functions.Function0<android.os.Bundle> argumentProducer);
-    method public Args getValue();
-    method public boolean isInitialized();
-    property public Args value;
-  }
-
-  public final class NavArgument {
-    method public Object? getDefaultValue();
-    method public androidx.navigation.NavType<java.lang.Object> getType();
-    method public boolean isDefaultValuePresent();
-    method public boolean isNullable();
-    property public final Object? defaultValue;
-    property public final boolean isDefaultValuePresent;
-    property public final boolean isNullable;
-    property public final androidx.navigation.NavType<java.lang.Object> type;
-  }
-
-  public static final class NavArgument.Builder {
-    ctor public NavArgument.Builder();
-    method public androidx.navigation.NavArgument build();
-    method public androidx.navigation.NavArgument.Builder setDefaultValue(Object? defaultValue);
-    method public androidx.navigation.NavArgument.Builder setIsNullable(boolean isNullable);
-    method public <T> androidx.navigation.NavArgument.Builder setType(androidx.navigation.NavType<T> type);
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class NavArgumentBuilder {
-    ctor public NavArgumentBuilder();
-    method public androidx.navigation.NavArgument build();
-    method public Object? getDefaultValue();
-    method public boolean getNullable();
-    method public androidx.navigation.NavType<?> getType();
-    method public void setDefaultValue(Object?);
-    method public void setNullable(boolean);
-    method public void setType(androidx.navigation.NavType<?>);
-    property public final Object? defaultValue;
-    property public final boolean nullable;
-    property public final androidx.navigation.NavType<?> type;
-  }
-
-  public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
-    method public android.os.Bundle? getArguments();
-    method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
-    method public androidx.navigation.NavDestination getDestination();
-    method public String getId();
-    method public androidx.lifecycle.Lifecycle getLifecycle();
-    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
-    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
-    method public androidx.lifecycle.ViewModelStore getViewModelStore();
-    property public final android.os.Bundle? arguments;
-    property public androidx.lifecycle.viewmodel.CreationExtras defaultViewModelCreationExtras;
-    property public androidx.lifecycle.ViewModelProvider.Factory defaultViewModelProviderFactory;
-    property public final androidx.navigation.NavDestination destination;
-    property public final String id;
-    property public androidx.lifecycle.Lifecycle lifecycle;
-    property public final androidx.lifecycle.SavedStateHandle savedStateHandle;
-    property public androidx.savedstate.SavedStateRegistry savedStateRegistry;
-    property public androidx.lifecycle.ViewModelStore viewModelStore;
-  }
-
-  public final class NavDeepLink {
-    method public String? getAction();
-    method public String? getMimeType();
-    method public String? getUriPattern();
-    property public final String? action;
-    property public final String? mimeType;
-    property public final String? uriPattern;
-  }
-
-  public static final class NavDeepLink.Builder {
-    method public androidx.navigation.NavDeepLink build();
-    method public static androidx.navigation.NavDeepLink.Builder fromAction(String action);
-    method public static androidx.navigation.NavDeepLink.Builder fromMimeType(String mimeType);
-    method public static androidx.navigation.NavDeepLink.Builder fromUriPattern(String uriPattern);
-    method public androidx.navigation.NavDeepLink.Builder setAction(String action);
-    method public androidx.navigation.NavDeepLink.Builder setMimeType(String mimeType);
-    method public androidx.navigation.NavDeepLink.Builder setUriPattern(String uriPattern);
-  }
-
-  @kotlin.DslMarker public @interface NavDeepLinkDsl {
-  }
-
-  @androidx.navigation.NavDeepLinkDsl public final class NavDeepLinkDslBuilder {
-    ctor public NavDeepLinkDslBuilder();
-    method public String? getAction();
-    method public String? getMimeType();
-    method public String? getUriPattern();
-    method public void setAction(String?);
-    method public void setMimeType(String?);
-    method public void setUriPattern(String?);
-    property public final String? action;
-    property public final String? mimeType;
-    property public final String? uriPattern;
-  }
-
-  public final class NavDeepLinkDslBuilderKt {
-    method public static androidx.navigation.NavDeepLink navDeepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> deepLinkBuilder);
-  }
-
-  public class NavDeepLinkRequest {
-    method public String? getAction();
-    method public String? getMimeType();
-    method public android.net.Uri? getUri();
-    property public String? action;
-    property public String? mimeType;
-    property public android.net.Uri? uri;
-  }
-
-  public static final class NavDeepLinkRequest.Builder {
-    method public androidx.navigation.NavDeepLinkRequest build();
-    method public static androidx.navigation.NavDeepLinkRequest.Builder fromAction(String action);
-    method public static androidx.navigation.NavDeepLinkRequest.Builder fromMimeType(String mimeType);
-    method public static androidx.navigation.NavDeepLinkRequest.Builder fromUri(android.net.Uri uri);
-    method public androidx.navigation.NavDeepLinkRequest.Builder setAction(String action);
-    method public androidx.navigation.NavDeepLinkRequest.Builder setMimeType(String mimeType);
-    method public androidx.navigation.NavDeepLinkRequest.Builder setUri(android.net.Uri uri);
-    field public static final androidx.navigation.NavDeepLinkRequest.Builder.Companion Companion;
-  }
-
-  public static final class NavDeepLinkRequest.Builder.Companion {
-    method public androidx.navigation.NavDeepLinkRequest.Builder fromAction(String action);
-    method public androidx.navigation.NavDeepLinkRequest.Builder fromMimeType(String mimeType);
-    method public androidx.navigation.NavDeepLinkRequest.Builder fromUri(android.net.Uri uri);
-  }
-
-  public class NavDestination {
-    ctor public NavDestination(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    ctor public NavDestination(String navigatorName);
-    method public final void addArgument(String argumentName, androidx.navigation.NavArgument argument);
-    method public final void addDeepLink(androidx.navigation.NavDeepLink navDeepLink);
-    method public final void addDeepLink(String uriPattern);
-    method public final String? fillInLabel(android.content.Context context, android.os.Bundle? bundle);
-    method public final androidx.navigation.NavAction? getAction(@IdRes int id);
-    method public final java.util.Map<java.lang.String,androidx.navigation.NavArgument> getArguments();
-    method public static final kotlin.sequences.Sequence<androidx.navigation.NavDestination> getHierarchy(androidx.navigation.NavDestination);
-    method @IdRes public final int getId();
-    method public final CharSequence? getLabel();
-    method public final String getNavigatorName();
-    method public final androidx.navigation.NavGraph? getParent();
-    method public final String? getRoute();
-    method public boolean hasDeepLink(android.net.Uri deepLink);
-    method public boolean hasDeepLink(androidx.navigation.NavDeepLinkRequest deepLinkRequest);
-    method @CallSuper public void onInflate(android.content.Context context, android.util.AttributeSet attrs);
-    method protected static final <C> Class<? extends C> parseClassFromName(android.content.Context context, String name, Class<? extends C> expectedClassType);
-    method public final void putAction(@IdRes int actionId, androidx.navigation.NavAction action);
-    method public final void putAction(@IdRes int actionId, @IdRes int destId);
-    method public final void removeAction(@IdRes int actionId);
-    method public final void removeArgument(String argumentName);
-    method public final void setId(@IdRes int);
-    method public final void setLabel(CharSequence?);
-    method public final void setRoute(String?);
-    property public final java.util.Map<java.lang.String,androidx.navigation.NavArgument> arguments;
-    property @IdRes public final int id;
-    property public final CharSequence? label;
-    property public final String navigatorName;
-    property public final androidx.navigation.NavGraph? parent;
-    property public final String? route;
-    field public static final androidx.navigation.NavDestination.Companion Companion;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS}) public static @interface NavDestination.ClassType {
-    method public abstract kotlin.reflect.KClass<?> value();
-    property public abstract kotlin.reflect.KClass<?> value;
-  }
-
-  public static final class NavDestination.Companion {
-    method public kotlin.sequences.Sequence<androidx.navigation.NavDestination> getHierarchy(androidx.navigation.NavDestination);
-    method protected <C> Class<? extends C> parseClassFromName(android.content.Context context, String name, Class<? extends C> expectedClassType);
-  }
-
-  @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
-    ctor @Deprecated public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, @IdRes int id);
-    ctor public NavDestinationBuilder(androidx.navigation.Navigator<? extends D> navigator, String? route);
-    method @Deprecated public final void action(int actionId, kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit> actionBuilder);
-    method public final void argument(String name, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit> argumentBuilder);
-    method public D build();
-    method public final void deepLink(String uriPattern);
-    method public final void deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit> navDeepLink);
-    method public final int getId();
-    method public final CharSequence? getLabel();
-    method protected final androidx.navigation.Navigator<? extends D> getNavigator();
-    method public final String? getRoute();
-    method public final void setLabel(CharSequence?);
-    property public final int id;
-    property public final CharSequence? label;
-    property protected final androidx.navigation.Navigator<? extends D> navigator;
-    property public final String? route;
-  }
-
-  @kotlin.DslMarker public @interface NavDestinationDsl {
-  }
-
-  public interface NavDirections {
-    method @IdRes public int getActionId();
-    method public android.os.Bundle getArguments();
-    property @IdRes public abstract int actionId;
-    property public abstract android.os.Bundle arguments;
-  }
-
-  public class NavGraph extends androidx.navigation.NavDestination implements java.lang.Iterable<androidx.navigation.NavDestination> kotlin.jvm.internal.markers.KMappedMarker {
-    ctor public NavGraph(androidx.navigation.Navigator<? extends androidx.navigation.NavGraph> navGraphNavigator);
-    method public final void addAll(androidx.navigation.NavGraph other);
-    method public final void addDestination(androidx.navigation.NavDestination node);
-    method public final void addDestinations(androidx.navigation.NavDestination... nodes);
-    method public final void addDestinations(java.util.Collection<? extends androidx.navigation.NavDestination> nodes);
-    method public final void clear();
-    method public final androidx.navigation.NavDestination? findNode(@IdRes int resId);
-    method public final androidx.navigation.NavDestination? findNode(String? route);
-    method public static final androidx.navigation.NavDestination findStartDestination(androidx.navigation.NavGraph);
-    method @Deprecated @IdRes public final int getStartDestination();
-    method @IdRes public final int getStartDestinationId();
-    method public final String? getStartDestinationRoute();
-    method public final java.util.Iterator<androidx.navigation.NavDestination> iterator();
-    method public final void remove(androidx.navigation.NavDestination node);
-    method public final void setStartDestination(int startDestId);
-    method public final void setStartDestination(String startDestRoute);
-    property @IdRes public final int startDestinationId;
-    property public final String? startDestinationRoute;
-    field public static final androidx.navigation.NavGraph.Companion Companion;
-  }
-
-  public static final class NavGraph.Companion {
-    method public androidx.navigation.NavDestination findStartDestination(androidx.navigation.NavGraph);
-  }
-
-  @androidx.navigation.NavDestinationDsl public class NavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.NavGraph> {
-    ctor @Deprecated public NavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination);
-    ctor public NavGraphBuilder(androidx.navigation.NavigatorProvider provider, String startDestination, String? route);
-    method public final void addDestination(androidx.navigation.NavDestination destination);
-    method public androidx.navigation.NavGraph build();
-    method public final <D extends androidx.navigation.NavDestination> void destination(androidx.navigation.NavDestinationBuilder<? extends D> navDestination);
-    method public final androidx.navigation.NavigatorProvider getProvider();
-    method public final operator void unaryPlus(androidx.navigation.NavDestination);
-    property public final androidx.navigation.NavigatorProvider provider;
-  }
-
-  public final class NavGraphBuilderKt {
-    method @Deprecated public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static inline void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method @Deprecated public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavGraphKt {
-    method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
-    method public static operator boolean contains(androidx.navigation.NavGraph, String route);
-    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
-    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, String route);
-    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
-  }
-
-  @androidx.navigation.Navigator.Name("navigation") public class NavGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.NavGraph> {
-    ctor public NavGraphNavigator(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public androidx.navigation.NavGraph createDestination();
-    method public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> getBackStack();
-    property public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> backStack;
-  }
-
-  public final class NavOptions {
-    method @AnimRes @AnimatorRes public int getEnterAnim();
-    method @AnimRes @AnimatorRes public int getExitAnim();
-    method @AnimRes @AnimatorRes public int getPopEnterAnim();
-    method @AnimRes @AnimatorRes public int getPopExitAnim();
-    method @Deprecated @IdRes public int getPopUpTo();
-    method @IdRes public int getPopUpToId();
-    method public String? getPopUpToRoute();
-    method public boolean isPopUpToInclusive();
-    method public boolean shouldLaunchSingleTop();
-    method public boolean shouldPopUpToSaveState();
-    method public boolean shouldRestoreState();
-    property @AnimRes @AnimatorRes public final int enterAnim;
-    property @AnimRes @AnimatorRes public final int exitAnim;
-    property @AnimRes @AnimatorRes public final int popEnterAnim;
-    property @AnimRes @AnimatorRes public final int popExitAnim;
-    property @IdRes public final int popUpToId;
-    property public final String? popUpToRoute;
-  }
-
-  public static final class NavOptions.Builder {
-    ctor public NavOptions.Builder();
-    method public androidx.navigation.NavOptions build();
-    method public androidx.navigation.NavOptions.Builder setEnterAnim(@AnimRes @AnimatorRes int enterAnim);
-    method public androidx.navigation.NavOptions.Builder setExitAnim(@AnimRes @AnimatorRes int exitAnim);
-    method public androidx.navigation.NavOptions.Builder setLaunchSingleTop(boolean singleTop);
-    method public androidx.navigation.NavOptions.Builder setPopEnterAnim(@AnimRes @AnimatorRes int popEnterAnim);
-    method public androidx.navigation.NavOptions.Builder setPopExitAnim(@AnimRes @AnimatorRes int popExitAnim);
-    method public androidx.navigation.NavOptions.Builder setPopUpTo(@IdRes int destinationId, boolean inclusive);
-    method public androidx.navigation.NavOptions.Builder setPopUpTo(@IdRes int destinationId, boolean inclusive, optional boolean saveState);
-    method public androidx.navigation.NavOptions.Builder setPopUpTo(String? route, boolean inclusive);
-    method public androidx.navigation.NavOptions.Builder setPopUpTo(String? route, boolean inclusive, optional boolean saveState);
-    method public androidx.navigation.NavOptions.Builder setRestoreState(boolean restoreState);
-  }
-
-  @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
-    ctor public NavOptionsBuilder();
-    method public void anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit> animBuilder);
-    method public boolean getLaunchSingleTop();
-    method @Deprecated public int getPopUpTo();
-    method public int getPopUpToId();
-    method public String? getPopUpToRoute();
-    method public boolean getRestoreState();
-    method public void popUpTo(@IdRes int id, optional kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit> popUpToBuilder);
-    method public void popUpTo(String route, optional kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit> popUpToBuilder);
-    method public void setLaunchSingleTop(boolean);
-    method @Deprecated public void setPopUpTo(int);
-    method public void setRestoreState(boolean);
-    property public final boolean launchSingleTop;
-    property @Deprecated public final int popUpTo;
-    property public final int popUpToId;
-    property public final String? popUpToRoute;
-    property public final boolean restoreState;
-  }
-
-  public final class NavOptionsBuilderKt {
-    method public static androidx.navigation.NavOptions navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> optionsBuilder);
-  }
-
-  @kotlin.DslMarker public @interface NavOptionsDsl {
-  }
-
-  public abstract class NavType<T> {
-    ctor public NavType(boolean isNullableAllowed);
-    method public static androidx.navigation.NavType<?> fromArgType(String? type, String? packageName);
-    method public abstract operator T? get(android.os.Bundle bundle, String key);
-    method public String getName();
-    method public boolean isNullableAllowed();
-    method public abstract T parseValue(String value);
-    method public T parseValue(String value, T previousValue);
-    method public abstract void put(android.os.Bundle bundle, String key, T value);
-    method public String serializeAsValue(T value);
-    property public boolean isNullableAllowed;
-    property public String name;
-    field public static final androidx.navigation.NavType<boolean[]> BoolArrayType;
-    field public static final androidx.navigation.NavType<java.lang.Boolean> BoolType;
-    field public static final androidx.navigation.NavType.Companion Companion;
-    field public static final androidx.navigation.NavType<float[]> FloatArrayType;
-    field public static final androidx.navigation.NavType<java.lang.Float> FloatType;
-    field public static final androidx.navigation.NavType<int[]> IntArrayType;
-    field public static final androidx.navigation.NavType<java.lang.Integer> IntType;
-    field public static final androidx.navigation.NavType<long[]> LongArrayType;
-    field public static final androidx.navigation.NavType<java.lang.Long> LongType;
-    field public static final androidx.navigation.NavType<java.lang.Integer> ReferenceType;
-    field public static final androidx.navigation.NavType<java.lang.String[]> StringArrayType;
-    field public static final androidx.navigation.NavType<java.lang.String> StringType;
-  }
-
-  public static final class NavType.Companion {
-    method public androidx.navigation.NavType<?> fromArgType(String? type, String? packageName);
-  }
-
-  public static final class NavType.EnumType<D extends java.lang.Enum<?>> extends androidx.navigation.NavType.SerializableType<D> {
-    ctor public NavType.EnumType(Class<D> type);
-    property public String name;
-  }
-
-  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
-    ctor public NavType.ParcelableArrayType(Class<D> type);
-    method public D![]? get(android.os.Bundle bundle, String key);
-    method public D![] parseValue(String value);
-    method public void put(android.os.Bundle bundle, String key, D![]? value);
-    property public String name;
-  }
-
-  public static final class NavType.ParcelableType<D> extends androidx.navigation.NavType<D> {
-    ctor public NavType.ParcelableType(Class<D> type);
-    method public D? get(android.os.Bundle bundle, String key);
-    method public D parseValue(String value);
-    method public void put(android.os.Bundle bundle, String key, D value);
-    property public String name;
-  }
-
-  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
-    ctor public NavType.SerializableArrayType(Class<D> type);
-    method public D![]? get(android.os.Bundle bundle, String key);
-    method public D![] parseValue(String value);
-    method public void put(android.os.Bundle bundle, String key, D![]? value);
-    property public String name;
-  }
-
-  public static class NavType.SerializableType<D extends java.io.Serializable> extends androidx.navigation.NavType<D> {
-    ctor public NavType.SerializableType(Class<D> type);
-    method public D? get(android.os.Bundle bundle, String key);
-    method public D parseValue(String value);
-    method public void put(android.os.Bundle bundle, String key, D value);
-    property public String name;
-  }
-
-  public abstract class Navigator<D extends androidx.navigation.NavDestination> {
-    ctor public Navigator();
-    method public abstract D createDestination();
-    method protected final androidx.navigation.NavigatorState getState();
-    method public final boolean isAttached();
-    method public androidx.navigation.NavDestination? navigate(D destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    method public void navigate(java.util.List<androidx.navigation.NavBackStackEntry> entries, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    method @CallSuper public void onAttach(androidx.navigation.NavigatorState state);
-    method public void onLaunchSingleTop(androidx.navigation.NavBackStackEntry backStackEntry);
-    method public void onRestoreState(android.os.Bundle savedState);
-    method public android.os.Bundle? onSaveState();
-    method public boolean popBackStack();
-    method public void popBackStack(androidx.navigation.NavBackStackEntry popUpTo, boolean savedState);
-    property public final boolean isAttached;
-    property protected final androidx.navigation.NavigatorState state;
-  }
-
-  public static interface Navigator.Extras {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS}) public static @interface Navigator.Name {
-    method public abstract String value();
-    property public abstract String value;
-  }
-
-  public class NavigatorProvider {
-    ctor public NavigatorProvider();
-    method public final androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    method @CallSuper public androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? addNavigator(String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    method public final <T extends androidx.navigation.Navigator<?>> T getNavigator(Class<T> navigatorClass);
-    method @CallSuper public <T extends androidx.navigation.Navigator<?>> T getNavigator(String name);
-  }
-
-  public final class NavigatorProviderKt {
-    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
-    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
-    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-  }
-
-  public abstract class NavigatorState {
-    ctor public NavigatorState();
-    method public abstract androidx.navigation.NavBackStackEntry createBackStackEntry(androidx.navigation.NavDestination destination, android.os.Bundle? arguments);
-    method public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> getBackStack();
-    method public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.navigation.NavBackStackEntry>> getTransitionsInProgress();
-    method public void markTransitionComplete(androidx.navigation.NavBackStackEntry entry);
-    method @CallSuper public void onLaunchSingleTop(androidx.navigation.NavBackStackEntry backStackEntry);
-    method @CallSuper public void onLaunchSingleTopWithTransition(androidx.navigation.NavBackStackEntry backStackEntry);
-    method public void pop(androidx.navigation.NavBackStackEntry popUpTo, boolean saveState);
-    method public void popWithTransition(androidx.navigation.NavBackStackEntry popUpTo, boolean saveState);
-    method @CallSuper public void prepareForTransition(androidx.navigation.NavBackStackEntry entry);
-    method public void push(androidx.navigation.NavBackStackEntry backStackEntry);
-    method public void pushWithTransition(androidx.navigation.NavBackStackEntry backStackEntry);
-    property public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> backStack;
-    property public final kotlinx.coroutines.flow.StateFlow<java.util.Set<androidx.navigation.NavBackStackEntry>> transitionsInProgress;
-  }
-
-  @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
-    ctor public PopUpToBuilder();
-    method public boolean getInclusive();
-    method public boolean getSaveState();
-    method public void setInclusive(boolean);
-    method public void setSaveState(boolean);
-    property public final boolean inclusive;
-    property public final boolean saveState;
-  }
-
-}
-
diff --git a/navigation/navigation-compose/api/public_plus_experimental_current.txt b/navigation/navigation-compose/api/public_plus_experimental_current.txt
deleted file mode 100644
index 6794d3e..0000000
--- a/navigation/navigation-compose/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation.compose {
-
-  @androidx.navigation.Navigator.Name("composable") public final class ComposeNavigator extends androidx.navigation.Navigator<androidx.navigation.compose.ComposeNavigator.Destination> {
-    ctor public ComposeNavigator();
-    method public androidx.navigation.compose.ComposeNavigator.Destination createDestination();
-    method public kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> getBackStack();
-    method public void onTransitionComplete(androidx.navigation.NavBackStackEntry entry);
-    property public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> backStack;
-  }
-
-  @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class ComposeNavigator.Destination extends androidx.navigation.NavDestination {
-    ctor @Deprecated public ComposeNavigator.Destination(androidx.navigation.compose.ComposeNavigator navigator, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-    ctor public ComposeNavigator.Destination(androidx.navigation.compose.ComposeNavigator navigator, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedContentScope,androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-  }
-
-  public final class DialogHostKt {
-    method @androidx.compose.runtime.Composable public static void DialogHost(androidx.navigation.compose.DialogNavigator dialogNavigator);
-  }
-
-  @androidx.navigation.Navigator.Name("dialog") public final class DialogNavigator extends androidx.navigation.Navigator<androidx.navigation.compose.DialogNavigator.Destination> {
-    ctor public DialogNavigator();
-    method public androidx.navigation.compose.DialogNavigator.Destination createDestination();
-  }
-
-  @androidx.navigation.NavDestination.ClassType(Composable::class) public static final class DialogNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
-    ctor public DialogNavigator.Destination(androidx.navigation.compose.DialogNavigator navigator, optional androidx.compose.ui.window.DialogProperties dialogProperties, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-  }
-
-  public final class NavBackStackEntryProviderKt {
-    method @androidx.compose.runtime.Composable public static void LocalOwnersProvider(androidx.navigation.NavBackStackEntry, androidx.compose.runtime.saveable.SaveableStateHolder saveableStateHolder, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-  }
-
-  public final class NavGraphBuilderKt {
-    method @Deprecated public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-    method public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedContentScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-    method public static void dialog(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional androidx.compose.ui.window.DialogProperties dialogProperties, kotlin.jvm.functions.Function1<? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
-    method public static void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method @Deprecated public static void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavHostControllerKt {
-    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.navigation.NavBackStackEntry> currentBackStackEntryAsState(androidx.navigation.NavController);
-    method @androidx.compose.runtime.Composable public static androidx.navigation.NavHostController rememberNavController(androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>... navigators);
-  }
-
-  public final class NavHostKt {
-    method @Deprecated @androidx.compose.runtime.Composable public static void NavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier);
-    method @androidx.compose.runtime.Composable public static void NavHost(androidx.navigation.NavHostController navController, androidx.navigation.NavGraph graph, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> popExitTransition);
-    method @androidx.compose.runtime.Composable public static void NavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment contentAlignment, optional String? route, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> enterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> exitTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.EnterTransition> popEnterTransition, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<androidx.navigation.NavBackStackEntry>,? extends androidx.compose.animation.ExitTransition> popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method @Deprecated @androidx.compose.runtime.Composable public static void NavHost(androidx.navigation.NavHostController navController, String startDestination, optional androidx.compose.ui.Modifier modifier, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-  }
-
-}
-
diff --git a/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt b/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt
deleted file mode 100644
index adb3dae..0000000
--- a/navigation/navigation-dynamic-features-fragment/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation.dynamicfeatures.fragment {
-
-  @androidx.navigation.Navigator.Name("fragment") public final class DynamicFragmentNavigator extends androidx.navigation.fragment.FragmentNavigator {
-    ctor public DynamicFragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager manager, int containerId, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
-    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination createDestination();
-  }
-
-  public static final class DynamicFragmentNavigator.Destination extends androidx.navigation.fragment.FragmentNavigator.Destination {
-    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> fragmentNavigator);
-    ctor public DynamicFragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public String? getModuleName();
-    method public void setModuleName(String?);
-    property public final String? moduleName;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class DynamicFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
-    ctor @Deprecated public DynamicFragmentNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator navigator, @IdRes int id, String fragmentClassName);
-    ctor public DynamicFragmentNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator navigator, String route, String fragmentClassName);
-    method public androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigator.Destination build();
-    method public String? getModuleName();
-    method public void setModuleName(String?);
-    property public final String? moduleName;
-  }
-
-  public final class DynamicFragmentNavigatorDestinationBuilderKt {
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id);
-    method @Deprecated public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route);
-    method public static inline void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route, String fragmentClassName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.fragment.DynamicFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public class DynamicNavHostFragment extends androidx.navigation.fragment.NavHostFragment {
-    ctor public DynamicNavHostFragment();
-    method public static final androidx.navigation.dynamicfeatures.fragment.DynamicNavHostFragment create(@NavigationRes int graphResId);
-    method public static final androidx.navigation.dynamicfeatures.fragment.DynamicNavHostFragment create(@NavigationRes int graphResId, optional android.os.Bundle? startDestinationArgs);
-    method protected com.google.android.play.core.splitinstall.SplitInstallManager createSplitInstallManager();
-    field public static final androidx.navigation.dynamicfeatures.fragment.DynamicNavHostFragment.Companion Companion;
-  }
-
-  public static final class DynamicNavHostFragment.Companion {
-    method public androidx.navigation.dynamicfeatures.fragment.DynamicNavHostFragment create(@NavigationRes int graphResId);
-    method public androidx.navigation.dynamicfeatures.fragment.DynamicNavHostFragment create(@NavigationRes int graphResId, optional android.os.Bundle? startDestinationArgs);
-  }
-
-}
-
-package androidx.navigation.dynamicfeatures.fragment.ui {
-
-  public abstract class AbstractProgressFragment extends androidx.fragment.app.Fragment {
-    ctor public AbstractProgressFragment();
-    ctor public AbstractProgressFragment(int contentLayoutId);
-    method protected abstract void onCancelled();
-    method protected abstract void onFailed(@com.google.android.play.core.splitinstall.model.SplitInstallErrorCode int errorCode);
-    method protected void onInstalled();
-    method protected abstract void onProgress(@com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus int status, long bytesDownloaded, long bytesTotal);
-  }
-
-  public final class DefaultProgressFragment extends androidx.navigation.dynamicfeatures.fragment.ui.AbstractProgressFragment {
-    ctor public DefaultProgressFragment();
-    method protected void onCancelled();
-    method protected void onFailed(@com.google.android.play.core.splitinstall.model.SplitInstallErrorCode int errorCode);
-    method protected void onProgress(int status, long bytesDownloaded, long bytesTotal);
-  }
-
-}
-
diff --git a/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt b/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index ff4252b..0000000
--- a/navigation/navigation-dynamic-features-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation.dynamicfeatures {
-
-  @androidx.navigation.Navigator.Name("activity") public final class DynamicActivityNavigator extends androidx.navigation.ActivityNavigator {
-    ctor public DynamicActivityNavigator(android.content.Context context, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
-    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination createDestination();
-  }
-
-  public static final class DynamicActivityNavigator.Destination extends androidx.navigation.ActivityNavigator.Destination {
-    ctor public DynamicActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination> activityNavigator);
-    ctor public DynamicActivityNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public String? getModuleName();
-    method public void setModuleName(String?);
-    property public final String? moduleName;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class DynamicActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
-    ctor @Deprecated public DynamicActivityNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.DynamicActivityNavigator activityNavigator, @IdRes int id);
-    ctor public DynamicActivityNavigatorDestinationBuilder(androidx.navigation.dynamicfeatures.DynamicActivityNavigator activityNavigator, String route);
-    method public androidx.navigation.dynamicfeatures.DynamicActivityNavigator.Destination build();
-    method public String? getAction();
-    method public String? getActivityClassName();
-    method public android.net.Uri? getData();
-    method public String? getDataPattern();
-    method public String? getModuleName();
-    method public String? getTargetPackage();
-    method public void setAction(String?);
-    method public void setActivityClassName(String?);
-    method public void setData(android.net.Uri?);
-    method public void setDataPattern(String?);
-    method public void setModuleName(String?);
-    method public void setTargetPackage(String?);
-    property public final String? action;
-    property public final String? activityClassName;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final String? moduleName;
-    property public final String? targetPackage;
-  }
-
-  public final class DynamicActivityNavigatorDestinationBuilderKt {
-    method @Deprecated public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline void activity(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class DynamicExtras implements androidx.navigation.Navigator.Extras {
-    ctor public DynamicExtras();
-    ctor public DynamicExtras(optional androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor);
-    ctor public DynamicExtras(optional androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor, optional androidx.navigation.Navigator.Extras? destinationExtras);
-    method public androidx.navigation.Navigator.Extras? getDestinationExtras();
-    method public androidx.navigation.dynamicfeatures.DynamicInstallMonitor? getInstallMonitor();
-    property public final androidx.navigation.Navigator.Extras? destinationExtras;
-    property public final androidx.navigation.dynamicfeatures.DynamicInstallMonitor? installMonitor;
-  }
-
-  @androidx.navigation.Navigator.Name("navigation") public final class DynamicGraphNavigator extends androidx.navigation.NavGraphNavigator {
-    ctor public DynamicGraphNavigator(androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
-    method public androidx.navigation.dynamicfeatures.DynamicGraphNavigator.DynamicNavGraph createDestination();
-    method public void installDefaultProgressDestination(kotlin.jvm.functions.Function0<? extends androidx.navigation.NavDestination> progressDestinationSupplier);
-  }
-
-  public static final class DynamicGraphNavigator.DynamicNavGraph extends androidx.navigation.NavGraph {
-    ctor public DynamicGraphNavigator.DynamicNavGraph(androidx.navigation.dynamicfeatures.DynamicGraphNavigator navGraphNavigator, androidx.navigation.NavigatorProvider navigatorProvider);
-    method public String? getModuleName();
-    method public int getProgressDestination();
-    method public void setModuleName(String?);
-    method public void setProgressDestination(int);
-    property public final String? moduleName;
-    property public final int progressDestination;
-  }
-
-  @androidx.navigation.Navigator.Name("include-dynamic") public final class DynamicIncludeGraphNavigator extends androidx.navigation.Navigator<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
-    ctor public DynamicIncludeGraphNavigator(android.content.Context context, androidx.navigation.NavigatorProvider navigatorProvider, androidx.navigation.NavInflater navInflater, androidx.navigation.dynamicfeatures.DynamicInstallManager installManager);
-    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph createDestination();
-  }
-
-  public static final class DynamicIncludeGraphNavigator.DynamicIncludeNavGraph extends androidx.navigation.NavDestination {
-    method public String? getGraphPackage();
-    method public String? getGraphResourceName();
-    method public String? getModuleName();
-    method public void setGraphPackage(String?);
-    method public void setGraphResourceName(String?);
-    method public void setModuleName(String?);
-    property public final String? graphPackage;
-    property public final String? graphResourceName;
-    property public final String? moduleName;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class DynamicIncludeNavGraphBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph> {
-    ctor @Deprecated public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, @IdRes int id, String moduleName, String graphResourceName);
-    ctor public DynamicIncludeNavGraphBuilder(androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator dynamicIncludeGraphNavigator, String route, String moduleName, String graphResourceName);
-    method public androidx.navigation.dynamicfeatures.DynamicIncludeGraphNavigator.DynamicIncludeNavGraph build();
-    method public String? getGraphPackage();
-    method public void setGraphPackage(String?);
-    property public final String? graphPackage;
-  }
-
-  public final class DynamicIncludeNavGraphBuilderKt {
-    method @Deprecated public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName);
-    method @Deprecated public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
-    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route, String moduleName, String graphResourceName);
-    method public static inline void includeDynamic(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String route, String moduleName, String graphResourceName, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicIncludeNavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public class DynamicInstallManager {
-    ctor public DynamicInstallManager(android.content.Context context, com.google.android.play.core.splitinstall.SplitInstallManager splitInstallManager);
-  }
-
-  public final class DynamicInstallMonitor {
-    ctor public DynamicInstallMonitor();
-    method public void cancelInstall();
-    method public Exception? getException();
-    method public int getSessionId();
-    method public androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> getStatus();
-    method public boolean isInstallRequired();
-    property public final Exception? exception;
-    property public final boolean isInstallRequired;
-    property public final int sessionId;
-    property public final androidx.lifecycle.LiveData<com.google.android.play.core.splitinstall.SplitInstallSessionState> status;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class DynamicNavGraphBuilder extends androidx.navigation.NavGraphBuilder {
-    ctor @Deprecated public DynamicNavGraphBuilder(androidx.navigation.NavigatorProvider provider, @IdRes int id, @IdRes int startDestination);
-    ctor public DynamicNavGraphBuilder(androidx.navigation.NavigatorProvider provider, String startDestination, optional String? route);
-    method public String? getModuleName();
-    method public int getProgressDestination();
-    method public String? getProgressDestinationRoute();
-    method public void setModuleName(String?);
-    method public void setProgressDestination(int);
-    method public void setProgressDestinationRoute(String?);
-    property public final String? moduleName;
-    property public final int progressDestination;
-    property public final String? progressDestinationRoute;
-  }
-
-  public final class DynamicNavGraphBuilderKt {
-    method @Deprecated public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-    method public static inline void navigation(androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder, String startDestination, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-    method @Deprecated public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavControllerKt {
-    method @Deprecated public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavHostKt {
-    method @Deprecated public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.dynamicfeatures.DynamicNavGraphBuilder,kotlin.Unit> builder);
-  }
-
-}
-
diff --git a/navigation/navigation-fragment-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-fragment-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/navigation/navigation-fragment-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/navigation/navigation-fragment/api/public_plus_experimental_current.txt b/navigation/navigation-fragment/api/public_plus_experimental_current.txt
deleted file mode 100644
index e9cbc61..0000000
--- a/navigation/navigation-fragment/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation {
-
-  public final class NavGraphViewModelLazyKt {
-    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, @IdRes int navGraphId, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.viewmodel.CreationExtras>? extrasProducer, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer);
-    method @Deprecated @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, @IdRes int navGraphId, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer);
-    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, String navGraphRoute, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.viewmodel.CreationExtras>? extrasProducer, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer);
-    method @Deprecated @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> navGraphViewModels(androidx.fragment.app.Fragment, String navGraphRoute, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer);
-  }
-
-}
-
-package androidx.navigation.fragment {
-
-  public abstract class AbstractListDetailFragment extends androidx.fragment.app.Fragment {
-    ctor public AbstractListDetailFragment();
-    method public final androidx.navigation.fragment.NavHostFragment getDetailPaneNavHostFragment();
-    method public final androidx.slidingpanelayout.widget.SlidingPaneLayout getSlidingPaneLayout();
-    method public androidx.navigation.fragment.NavHostFragment onCreateDetailPaneNavHostFragment();
-    method public abstract android.view.View onCreateListPaneView(android.view.LayoutInflater inflater, android.view.ViewGroup? container, android.os.Bundle? savedInstanceState);
-    method @CallSuper public final android.view.View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup? container, android.os.Bundle? savedInstanceState);
-    method public void onListPaneViewCreated(android.view.View view, android.os.Bundle? savedInstanceState);
-    method @CallSuper public final void onViewCreated(android.view.View view, android.os.Bundle? savedInstanceState);
-    property public final androidx.navigation.fragment.NavHostFragment detailPaneNavHostFragment;
-    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout slidingPaneLayout;
-  }
-
-  @androidx.navigation.Navigator.Name("dialog") public final class DialogFragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
-    ctor public DialogFragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager fragmentManager);
-    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination createDestination();
-  }
-
-  @androidx.navigation.NavDestination.ClassType(DialogFragment::class) public static class DialogFragmentNavigator.Destination extends androidx.navigation.NavDestination implements androidx.navigation.FloatingWindow {
-    ctor public DialogFragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.DialogFragmentNavigator.Destination> fragmentNavigator);
-    ctor public DialogFragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public final String getClassName();
-    method public final androidx.navigation.fragment.DialogFragmentNavigator.Destination setClassName(String className);
-    property public final String className;
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class DialogFragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.DialogFragmentNavigator.Destination> {
-    ctor @Deprecated public DialogFragmentNavigatorDestinationBuilder(androidx.navigation.fragment.DialogFragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.DialogFragment> fragmentClass);
-    ctor public DialogFragmentNavigatorDestinationBuilder(androidx.navigation.fragment.DialogFragmentNavigator navigator, String route, kotlin.reflect.KClass<? extends androidx.fragment.app.DialogFragment> fragmentClass);
-    method public androidx.navigation.fragment.DialogFragmentNavigator.Destination build();
-  }
-
-  public final class DialogFragmentNavigatorDestinationBuilderKt {
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id);
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.DialogFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, String route);
-    method public static inline <reified F extends androidx.fragment.app.DialogFragment> void dialog(androidx.navigation.NavGraphBuilder, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.DialogFragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class FragmentKt {
-    method public static androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment);
-  }
-
-  public final class FragmentNavArgsLazyKt {
-    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(androidx.fragment.app.Fragment);
-  }
-
-  @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
-    ctor public FragmentNavigator(android.content.Context context, androidx.fragment.app.FragmentManager fragmentManager, int containerId);
-    method public androidx.navigation.fragment.FragmentNavigator.Destination createDestination();
-    method @Deprecated public androidx.fragment.app.Fragment instantiateFragment(android.content.Context context, androidx.fragment.app.FragmentManager fragmentManager, String className, android.os.Bundle? args);
-  }
-
-  @androidx.navigation.NavDestination.ClassType(Fragment::class) public static class FragmentNavigator.Destination extends androidx.navigation.NavDestination {
-    ctor public FragmentNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> fragmentNavigator);
-    ctor public FragmentNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public final String getClassName();
-    method public final androidx.navigation.fragment.FragmentNavigator.Destination setClassName(String className);
-    property public final String className;
-  }
-
-  public static final class FragmentNavigator.Extras implements androidx.navigation.Navigator.Extras {
-    method public java.util.Map<android.view.View,java.lang.String> getSharedElements();
-    property public final java.util.Map<android.view.View,java.lang.String> sharedElements;
-  }
-
-  public static final class FragmentNavigator.Extras.Builder {
-    ctor public FragmentNavigator.Extras.Builder();
-    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElement(android.view.View sharedElement, String name);
-    method public androidx.navigation.fragment.FragmentNavigator.Extras.Builder addSharedElements(java.util.Map<android.view.View,java.lang.String> sharedElements);
-    method public androidx.navigation.fragment.FragmentNavigator.Extras build();
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
-    ctor @Deprecated public FragmentNavigatorDestinationBuilder(androidx.navigation.fragment.FragmentNavigator navigator, @IdRes int id, kotlin.reflect.KClass<? extends androidx.fragment.app.Fragment> fragmentClass);
-    ctor public FragmentNavigatorDestinationBuilder(androidx.navigation.fragment.FragmentNavigator navigator, String route, kotlin.reflect.KClass<? extends androidx.fragment.app.Fragment> fragmentClass);
-    method public androidx.navigation.fragment.FragmentNavigator.Destination build();
-  }
-
-  public final class FragmentNavigatorDestinationBuilderKt {
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
-    method @Deprecated public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, String route);
-    method public static inline <reified F extends androidx.fragment.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class FragmentNavigatorExtrasKt {
-    method public static androidx.navigation.fragment.FragmentNavigator.Extras FragmentNavigatorExtras(kotlin.Pair<? extends android.view.View,java.lang.String>... sharedElements);
-  }
-
-  public class NavHostFragment extends androidx.fragment.app.Fragment implements androidx.navigation.NavHost {
-    ctor public NavHostFragment();
-    method public static final androidx.navigation.fragment.NavHostFragment create(@NavigationRes int graphResId);
-    method public static final androidx.navigation.fragment.NavHostFragment create(@NavigationRes int graphResId, optional android.os.Bundle? startDestinationArgs);
-    method @Deprecated protected androidx.navigation.Navigator<? extends androidx.navigation.fragment.FragmentNavigator.Destination> createFragmentNavigator();
-    method public static final androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment fragment);
-    method public final androidx.navigation.NavController getNavController();
-    method @Deprecated @CallSuper protected void onCreateNavController(androidx.navigation.NavController navController);
-    method @CallSuper protected void onCreateNavHostController(androidx.navigation.NavHostController navHostController);
-    property public final androidx.navigation.NavController navController;
-    field public static final androidx.navigation.fragment.NavHostFragment.Companion Companion;
-  }
-
-  public static final class NavHostFragment.Companion {
-    method public androidx.navigation.fragment.NavHostFragment create(@NavigationRes int graphResId);
-    method public androidx.navigation.fragment.NavHostFragment create(@NavigationRes int graphResId, optional android.os.Bundle? startDestinationArgs);
-    method public androidx.navigation.NavController findNavController(androidx.fragment.app.Fragment fragment);
-  }
-
-}
-
diff --git a/navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/navigation/navigation-runtime/api/current.txt b/navigation/navigation-runtime/api/current.txt
index 824892c..2ec837e 100644
--- a/navigation/navigation-runtime/api/current.txt
+++ b/navigation/navigation-runtime/api/current.txt
@@ -94,6 +94,7 @@
     method @MainThread public final boolean clearBackStack(@IdRes int destinationId);
     method @MainThread public final boolean clearBackStack(String route);
     method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
+    method @androidx.navigation.NavDeepLinkSaveStateControl public static final void enableDeepLinkSaveState(boolean saveState);
     method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int destinationId);
     method public final androidx.navigation.NavBackStackEntry getBackStackEntry(String route);
     method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
@@ -149,6 +150,7 @@
   }
 
   public static final class NavController.Companion {
+    method @androidx.navigation.NavDeepLinkSaveStateControl public void enableDeepLinkSaveState(boolean saveState);
   }
 
   public static fun interface NavController.OnDestinationChangedListener {
@@ -179,6 +181,9 @@
     method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int navGraphId);
   }
 
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface NavDeepLinkSaveStateControl {
+  }
+
   public interface NavHost {
     method public androidx.navigation.NavController getNavController();
     property public abstract androidx.navigation.NavController navController;
diff --git a/navigation/navigation-runtime/api/public_plus_experimental_current.txt b/navigation/navigation-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index 2ec837e..0000000
--- a/navigation/navigation-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,229 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation {
-
-  public final class ActivityKt {
-    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
-  }
-
-  public final class ActivityNavArgsLazyKt {
-    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args> navArgs(android.app.Activity);
-  }
-
-  @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
-    ctor public ActivityNavigator(android.content.Context context);
-    method public static final void applyPopAnimationsToPendingTransition(android.app.Activity activity);
-    method public androidx.navigation.ActivityNavigator.Destination createDestination();
-    method public androidx.navigation.NavDestination? navigate(androidx.navigation.ActivityNavigator.Destination destination, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    field public static final androidx.navigation.ActivityNavigator.Companion Companion;
-  }
-
-  public static final class ActivityNavigator.Companion {
-    method public void applyPopAnimationsToPendingTransition(android.app.Activity activity);
-  }
-
-  @androidx.navigation.NavDestination.ClassType(Activity::class) public static class ActivityNavigator.Destination extends androidx.navigation.NavDestination {
-    ctor public ActivityNavigator.Destination(androidx.navigation.Navigator<? extends androidx.navigation.ActivityNavigator.Destination> activityNavigator);
-    ctor public ActivityNavigator.Destination(androidx.navigation.NavigatorProvider navigatorProvider);
-    method public final String? getAction();
-    method public final android.content.ComponentName? getComponent();
-    method public final android.net.Uri? getData();
-    method public final String? getDataPattern();
-    method public final android.content.Intent? getIntent();
-    method public final String? getTargetPackage();
-    method public final androidx.navigation.ActivityNavigator.Destination setAction(String? action);
-    method public final androidx.navigation.ActivityNavigator.Destination setComponentName(android.content.ComponentName? name);
-    method public final androidx.navigation.ActivityNavigator.Destination setData(android.net.Uri? data);
-    method public final androidx.navigation.ActivityNavigator.Destination setDataPattern(String? dataPattern);
-    method public final androidx.navigation.ActivityNavigator.Destination setIntent(android.content.Intent? intent);
-    method public final androidx.navigation.ActivityNavigator.Destination setTargetPackage(String? packageName);
-    property public final String? action;
-    property public final android.content.ComponentName? component;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final android.content.Intent? intent;
-    property public final String? targetPackage;
-  }
-
-  public static final class ActivityNavigator.Extras implements androidx.navigation.Navigator.Extras {
-    method public androidx.core.app.ActivityOptionsCompat? getActivityOptions();
-    method public int getFlags();
-    property public final androidx.core.app.ActivityOptionsCompat? activityOptions;
-    property public final int flags;
-  }
-
-  public static final class ActivityNavigator.Extras.Builder {
-    ctor public ActivityNavigator.Extras.Builder();
-    method public androidx.navigation.ActivityNavigator.Extras.Builder addFlags(int flags);
-    method public androidx.navigation.ActivityNavigator.Extras build();
-    method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat activityOptions);
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
-    ctor @Deprecated public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
-    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, String route);
-    method public androidx.navigation.ActivityNavigator.Destination build();
-    method public String? getAction();
-    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
-    method public android.net.Uri? getData();
-    method public String? getDataPattern();
-    method public String? getTargetPackage();
-    method public void setAction(String?);
-    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>?);
-    method public void setData(android.net.Uri?);
-    method public void setDataPattern(String?);
-    method public void setTargetPackage(String?);
-    property public final String? action;
-    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final String? targetPackage;
-  }
-
-  public final class ActivityNavigatorDestinationBuilderKt {
-    method @Deprecated public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, String route, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class ActivityNavigatorExtrasKt {
-    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(optional androidx.core.app.ActivityOptionsCompat? activityOptions, optional int flags);
-  }
-
-  public class NavController {
-    ctor public NavController(android.content.Context context);
-    method public void addOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener listener);
-    method @MainThread public final boolean clearBackStack(@IdRes int destinationId);
-    method @MainThread public final boolean clearBackStack(String route);
-    method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
-    method @androidx.navigation.NavDeepLinkSaveStateControl public static final void enableDeepLinkSaveState(boolean saveState);
-    method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int destinationId);
-    method public final androidx.navigation.NavBackStackEntry getBackStackEntry(String route);
-    method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
-    method public final kotlinx.coroutines.flow.Flow<androidx.navigation.NavBackStackEntry> getCurrentBackStackEntryFlow();
-    method public androidx.navigation.NavDestination? getCurrentDestination();
-    method @MainThread public androidx.navigation.NavGraph getGraph();
-    method public androidx.navigation.NavInflater getNavInflater();
-    method public androidx.navigation.NavigatorProvider getNavigatorProvider();
-    method public androidx.navigation.NavBackStackEntry? getPreviousBackStackEntry();
-    method public androidx.lifecycle.ViewModelStoreOwner getViewModelStoreOwner(@IdRes int navGraphId);
-    method public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> getVisibleEntries();
-    method @MainThread public boolean handleDeepLink(android.content.Intent? intent);
-    method @MainThread public void navigate(android.net.Uri deepLink);
-    method @MainThread public void navigate(android.net.Uri deepLink, androidx.navigation.NavOptions? navOptions);
-    method @MainThread public void navigate(android.net.Uri deepLink, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    method @MainThread public void navigate(androidx.navigation.NavDeepLinkRequest request);
-    method @MainThread public void navigate(androidx.navigation.NavDeepLinkRequest request, androidx.navigation.NavOptions? navOptions);
-    method @MainThread public void navigate(androidx.navigation.NavDeepLinkRequest request, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    method @MainThread public void navigate(androidx.navigation.NavDirections directions);
-    method @MainThread public void navigate(androidx.navigation.NavDirections directions, androidx.navigation.Navigator.Extras navigatorExtras);
-    method @MainThread public void navigate(androidx.navigation.NavDirections directions, androidx.navigation.NavOptions? navOptions);
-    method @MainThread public void navigate(@IdRes int resId);
-    method @MainThread public void navigate(@IdRes int resId, android.os.Bundle? args);
-    method @MainThread public void navigate(@IdRes int resId, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions);
-    method @MainThread public void navigate(@IdRes int resId, android.os.Bundle? args, androidx.navigation.NavOptions? navOptions, androidx.navigation.Navigator.Extras? navigatorExtras);
-    method @MainThread public final void navigate(String route);
-    method @MainThread public final void navigate(String route, optional androidx.navigation.NavOptions? navOptions);
-    method @MainThread public final void navigate(String route, optional androidx.navigation.NavOptions? navOptions, optional androidx.navigation.Navigator.Extras? navigatorExtras);
-    method @MainThread public final void navigate(String route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit> builder);
-    method @MainThread public boolean navigateUp();
-    method @MainThread public boolean popBackStack();
-    method @MainThread public boolean popBackStack(@IdRes int destinationId, boolean inclusive);
-    method @MainThread public boolean popBackStack(@IdRes int destinationId, boolean inclusive, boolean saveState);
-    method @MainThread public final boolean popBackStack(String route, boolean inclusive);
-    method @MainThread public final boolean popBackStack(String route, boolean inclusive, optional boolean saveState);
-    method public void removeOnDestinationChangedListener(androidx.navigation.NavController.OnDestinationChangedListener listener);
-    method @CallSuper public void restoreState(android.os.Bundle? navState);
-    method @CallSuper public android.os.Bundle? saveState();
-    method @CallSuper @MainThread public void setGraph(androidx.navigation.NavGraph);
-    method @CallSuper @MainThread public void setGraph(androidx.navigation.NavGraph graph, android.os.Bundle? startDestinationArgs);
-    method @CallSuper @MainThread public void setGraph(@NavigationRes int graphResId);
-    method @CallSuper @MainThread public void setGraph(@NavigationRes int graphResId, android.os.Bundle? startDestinationArgs);
-    property public androidx.navigation.NavBackStackEntry? currentBackStackEntry;
-    property public final kotlinx.coroutines.flow.Flow<androidx.navigation.NavBackStackEntry> currentBackStackEntryFlow;
-    property public androidx.navigation.NavDestination? currentDestination;
-    property @MainThread public androidx.navigation.NavGraph graph;
-    property public androidx.navigation.NavInflater navInflater;
-    property public androidx.navigation.NavigatorProvider navigatorProvider;
-    property public androidx.navigation.NavBackStackEntry? previousBackStackEntry;
-    property public final kotlinx.coroutines.flow.StateFlow<java.util.List<androidx.navigation.NavBackStackEntry>> visibleEntries;
-    field public static final androidx.navigation.NavController.Companion Companion;
-    field public static final String KEY_DEEP_LINK_INTENT = "android-support-nav:controller:deepLinkIntent";
-  }
-
-  public static final class NavController.Companion {
-    method @androidx.navigation.NavDeepLinkSaveStateControl public void enableDeepLinkSaveState(boolean saveState);
-  }
-
-  public static fun interface NavController.OnDestinationChangedListener {
-    method public void onDestinationChanged(androidx.navigation.NavController controller, androidx.navigation.NavDestination destination, android.os.Bundle? arguments);
-  }
-
-  public final class NavControllerKt {
-    method @Deprecated public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavDeepLinkBuilder {
-    ctor public NavDeepLinkBuilder(android.content.Context context);
-    method public androidx.navigation.NavDeepLinkBuilder addDestination(@IdRes int destId);
-    method public androidx.navigation.NavDeepLinkBuilder addDestination(@IdRes int destId, optional android.os.Bundle? args);
-    method public androidx.navigation.NavDeepLinkBuilder addDestination(String route);
-    method public androidx.navigation.NavDeepLinkBuilder addDestination(String route, optional android.os.Bundle? args);
-    method public android.app.PendingIntent createPendingIntent();
-    method public androidx.core.app.TaskStackBuilder createTaskStackBuilder();
-    method public androidx.navigation.NavDeepLinkBuilder setArguments(android.os.Bundle? args);
-    method public androidx.navigation.NavDeepLinkBuilder setComponentName(android.content.ComponentName componentName);
-    method public androidx.navigation.NavDeepLinkBuilder setComponentName(Class<? extends android.app.Activity> activityClass);
-    method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int destId);
-    method public androidx.navigation.NavDeepLinkBuilder setDestination(@IdRes int destId, optional android.os.Bundle? args);
-    method public androidx.navigation.NavDeepLinkBuilder setDestination(String destRoute);
-    method public androidx.navigation.NavDeepLinkBuilder setDestination(String destRoute, optional android.os.Bundle? args);
-    method public androidx.navigation.NavDeepLinkBuilder setGraph(androidx.navigation.NavGraph navGraph);
-    method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int navGraphId);
-  }
-
-  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface NavDeepLinkSaveStateControl {
-  }
-
-  public interface NavHost {
-    method public androidx.navigation.NavController getNavController();
-    property public abstract androidx.navigation.NavController navController;
-  }
-
-  public class NavHostController extends androidx.navigation.NavController {
-    ctor public NavHostController(android.content.Context context);
-    method public final void enableOnBackPressed(boolean enabled);
-    method public final void setLifecycleOwner(androidx.lifecycle.LifecycleOwner owner);
-    method public final void setOnBackPressedDispatcher(androidx.activity.OnBackPressedDispatcher dispatcher);
-    method public final void setViewModelStore(androidx.lifecycle.ViewModelStore viewModelStore);
-  }
-
-  public final class NavHostKt {
-    method @Deprecated public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, optional @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, String startDestination, optional String? route, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-  }
-
-  public final class NavInflater {
-    ctor public NavInflater(android.content.Context context, androidx.navigation.NavigatorProvider navigatorProvider);
-    method public androidx.navigation.NavGraph inflate(@NavigationRes int graphResId);
-    field public static final androidx.navigation.NavInflater.Companion Companion;
-  }
-
-  public static final class NavInflater.Companion {
-  }
-
-  public final class Navigation {
-    method public static android.view.View.OnClickListener createNavigateOnClickListener(androidx.navigation.NavDirections directions);
-    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int resId);
-    method public static android.view.View.OnClickListener createNavigateOnClickListener(@IdRes int resId, optional android.os.Bundle? args);
-    method public static androidx.navigation.NavController findNavController(android.app.Activity activity, @IdRes int viewId);
-    method public static androidx.navigation.NavController findNavController(android.view.View view);
-    method public static void setViewNavController(android.view.View view, androidx.navigation.NavController? controller);
-    field public static final androidx.navigation.Navigation INSTANCE;
-  }
-
-  public final class ViewKt {
-    method public static androidx.navigation.NavController findNavController(android.view.View);
-  }
-
-}
-
diff --git a/navigation/navigation-runtime/api/restricted_current.txt b/navigation/navigation-runtime/api/restricted_current.txt
index 824892c..2ec837e 100644
--- a/navigation/navigation-runtime/api/restricted_current.txt
+++ b/navigation/navigation-runtime/api/restricted_current.txt
@@ -94,6 +94,7 @@
     method @MainThread public final boolean clearBackStack(@IdRes int destinationId);
     method @MainThread public final boolean clearBackStack(String route);
     method public androidx.navigation.NavDeepLinkBuilder createDeepLink();
+    method @androidx.navigation.NavDeepLinkSaveStateControl public static final void enableDeepLinkSaveState(boolean saveState);
     method public androidx.navigation.NavBackStackEntry getBackStackEntry(@IdRes int destinationId);
     method public final androidx.navigation.NavBackStackEntry getBackStackEntry(String route);
     method public androidx.navigation.NavBackStackEntry? getCurrentBackStackEntry();
@@ -149,6 +150,7 @@
   }
 
   public static final class NavController.Companion {
+    method @androidx.navigation.NavDeepLinkSaveStateControl public void enableDeepLinkSaveState(boolean saveState);
   }
 
   public static fun interface NavController.OnDestinationChangedListener {
@@ -179,6 +181,9 @@
     method public androidx.navigation.NavDeepLinkBuilder setGraph(@NavigationRes int navGraphId);
   }
 
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface NavDeepLinkSaveStateControl {
+  }
+
   public interface NavHost {
     method public androidx.navigation.NavController getNavController();
     property public abstract androidx.navigation.NavController navController;
diff --git a/navigation/navigation-testing/api/public_plus_experimental_current.txt b/navigation/navigation-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index 90caa3a..0000000
--- a/navigation/navigation-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-// Signature format: 4.0
-package androidx.navigation.testing {
-
-  public final class TestNavHostController extends androidx.navigation.NavHostController {
-    ctor public TestNavHostController(android.content.Context context);
-    method public java.util.List<androidx.navigation.NavBackStackEntry> getBackStack();
-    method public void setCurrentDestination(@IdRes int destId);
-    method public void setCurrentDestination(@IdRes int destId, optional android.os.Bundle args);
-    method public void setCurrentDestination(String destRoute);
-    method public void setCurrentDestination(String destRoute, optional android.os.Bundle args);
-    property public final java.util.List<androidx.navigation.NavBackStackEntry> backStack;
-  }
-
-  public final class TestNavigatorState extends androidx.navigation.NavigatorState {
-    ctor public TestNavigatorState();
-    ctor public TestNavigatorState(optional android.content.Context? context);
-    ctor public TestNavigatorState(optional android.content.Context? context, optional kotlinx.coroutines.CoroutineDispatcher coroutineDispatcher);
-    method public androidx.navigation.NavBackStackEntry createBackStackEntry(androidx.navigation.NavDestination destination, android.os.Bundle? arguments);
-    method public androidx.navigation.NavBackStackEntry restoreBackStackEntry(androidx.navigation.NavBackStackEntry previouslySavedEntry);
-  }
-
-}
-
diff --git a/navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/navigation/navigation-ui-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/paging/paging-common-ktx/api/public_plus_experimental_current.txt b/paging/paging-common-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/paging/paging-common-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/paging/paging-common/api/current.txt b/paging/paging-common/api/current.txt
index ffc28e1..a9a0517 100644
--- a/paging/paging-common/api/current.txt
+++ b/paging/paging-common/api/current.txt
@@ -46,6 +46,9 @@
     method @AnyThread public void onInvalidated();
   }
 
+  @kotlin.RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalPagingApi {
+  }
+
   public final class InvalidatingPagingSourceFactory<Key, Value> implements androidx.paging.PagingSourceFactory<Key,Value> {
     ctor public InvalidatingPagingSourceFactory(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     method public void invalidate();
@@ -266,6 +269,7 @@
   }
 
   public final class Pager<Key, Value> {
+    ctor @androidx.paging.ExperimentalPagingApi public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, androidx.paging.RemoteMediator<Key,Value>? remoteMediator, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     ctor public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     ctor public Pager(androidx.paging.PagingConfig config, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     method public kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<Value>> getFlow();
@@ -467,6 +471,34 @@
     field @Deprecated public final int startPosition;
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RemoteMediator<Key, Value> {
+    ctor public RemoteMediator();
+    method public suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public abstract suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+  }
+
+  public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
+    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
+    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
+  }
+
+  public abstract static sealed class RemoteMediator.MediatorResult {
+  }
+
+  public static final class RemoteMediator.MediatorResult.Error extends androidx.paging.RemoteMediator.MediatorResult {
+    ctor public RemoteMediator.MediatorResult.Error(Throwable throwable);
+    method public Throwable getThrowable();
+    property public final Throwable throwable;
+  }
+
+  public static final class RemoteMediator.MediatorResult.Success extends androidx.paging.RemoteMediator.MediatorResult {
+    ctor public RemoteMediator.MediatorResult.Success(boolean endOfPaginationReached);
+    method public boolean getEndOfPaginationReached();
+    property public final boolean endOfPaginationReached;
+  }
+
   public enum TerminalSeparatorType {
     method public static androidx.paging.TerminalSeparatorType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
     method public static androidx.paging.TerminalSeparatorType[] values();
diff --git a/paging/paging-common/api/public_plus_experimental_current.txt b/paging/paging-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index a9a0517..0000000
--- a/paging/paging-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,510 +0,0 @@
-// Signature format: 4.0
-package androidx.paging {
-
-  public final class CachedPagingDataKt {
-    method @CheckResult public static <T> kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<T>> cachedIn(kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-  }
-
-  public final class CombinedLoadStates {
-    ctor public CombinedLoadStates(androidx.paging.LoadState refresh, androidx.paging.LoadState prepend, androidx.paging.LoadState append, androidx.paging.LoadStates source, optional androidx.paging.LoadStates? mediator);
-    method public androidx.paging.LoadState getAppend();
-    method public androidx.paging.LoadStates? getMediator();
-    method public androidx.paging.LoadState getPrepend();
-    method public androidx.paging.LoadState getRefresh();
-    method public androidx.paging.LoadStates getSource();
-    property public final androidx.paging.LoadState append;
-    property public final androidx.paging.LoadStates? mediator;
-    property public final androidx.paging.LoadState prepend;
-    property public final androidx.paging.LoadState refresh;
-    property public final androidx.paging.LoadStates source;
-  }
-
-  public abstract class DataSource<Key, Value> {
-    method @AnyThread public void addInvalidatedCallback(androidx.paging.DataSource.InvalidatedCallback onInvalidatedCallback);
-    method @AnyThread public void invalidate();
-    method @WorkerThread public boolean isInvalid();
-    method public <ToValue> androidx.paging.DataSource<Key,ToValue> map(androidx.arch.core.util.Function<Value,ToValue> function);
-    method @kotlin.jvm.JvmSynthetic public <ToValue> androidx.paging.DataSource<Key,ToValue> map(kotlin.jvm.functions.Function1<? super Value,? extends ToValue> function);
-    method public <ToValue> androidx.paging.DataSource<Key,ToValue> mapByPage(androidx.arch.core.util.Function<java.util.List<Value>,java.util.List<ToValue>> function);
-    method @kotlin.jvm.JvmSynthetic public <ToValue> androidx.paging.DataSource<Key,ToValue> mapByPage(kotlin.jvm.functions.Function1<? super java.util.List<? extends Value>,? extends java.util.List<? extends ToValue>> function);
-    method @AnyThread public void removeInvalidatedCallback(androidx.paging.DataSource.InvalidatedCallback onInvalidatedCallback);
-    property @WorkerThread public boolean isInvalid;
-  }
-
-  public abstract static class DataSource.Factory<Key, Value> {
-    ctor public DataSource.Factory();
-    method public final kotlin.jvm.functions.Function0<androidx.paging.PagingSource<Key,Value>> asPagingSourceFactory();
-    method public final kotlin.jvm.functions.Function0<androidx.paging.PagingSource<Key,Value>> asPagingSourceFactory(optional kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
-    method public abstract androidx.paging.DataSource<Key,Value> create();
-    method public <ToValue> androidx.paging.DataSource.Factory<Key,ToValue> map(androidx.arch.core.util.Function<Value,ToValue> function);
-    method @kotlin.jvm.JvmSynthetic public <ToValue> androidx.paging.DataSource.Factory<Key,ToValue> map(kotlin.jvm.functions.Function1<? super Value,? extends ToValue> function);
-    method public <ToValue> androidx.paging.DataSource.Factory<Key,ToValue> mapByPage(androidx.arch.core.util.Function<java.util.List<Value>,java.util.List<ToValue>> function);
-    method @kotlin.jvm.JvmSynthetic public <ToValue> androidx.paging.DataSource.Factory<Key,ToValue> mapByPage(kotlin.jvm.functions.Function1<? super java.util.List<? extends Value>,? extends java.util.List<? extends ToValue>> function);
-  }
-
-  public static fun interface DataSource.InvalidatedCallback {
-    method @AnyThread public void onInvalidated();
-  }
-
-  @kotlin.RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalPagingApi {
-  }
-
-  public final class InvalidatingPagingSourceFactory<Key, Value> implements androidx.paging.PagingSourceFactory<Key,Value> {
-    ctor public InvalidatingPagingSourceFactory(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
-    method public void invalidate();
-    method public androidx.paging.PagingSource<Key,Value> invoke();
-  }
-
-  @Deprecated public abstract class ItemKeyedDataSource<Key, Value> extends androidx.paging.DataSource<Key,Value> {
-    ctor @Deprecated public ItemKeyedDataSource();
-    method @Deprecated public abstract Key getKey(Value item);
-    method @Deprecated public abstract void loadAfter(androidx.paging.ItemKeyedDataSource.LoadParams<Key> params, androidx.paging.ItemKeyedDataSource.LoadCallback<Value> callback);
-    method @Deprecated public abstract void loadBefore(androidx.paging.ItemKeyedDataSource.LoadParams<Key> params, androidx.paging.ItemKeyedDataSource.LoadCallback<Value> callback);
-    method @Deprecated public abstract void loadInitial(androidx.paging.ItemKeyedDataSource.LoadInitialParams<Key> params, androidx.paging.ItemKeyedDataSource.LoadInitialCallback<Value> callback);
-    method @Deprecated public final <ToValue> androidx.paging.ItemKeyedDataSource<Key,ToValue> map(androidx.arch.core.util.Function<Value,ToValue> function);
-    method @Deprecated public final <ToValue> androidx.paging.ItemKeyedDataSource<Key,ToValue> map(kotlin.jvm.functions.Function1<? super Value,? extends ToValue> function);
-    method @Deprecated public final <ToValue> androidx.paging.ItemKeyedDataSource<Key,ToValue> mapByPage(androidx.arch.core.util.Function<java.util.List<Value>,java.util.List<ToValue>> function);
-    method @Deprecated public final <ToValue> androidx.paging.ItemKeyedDataSource<Key,ToValue> mapByPage(kotlin.jvm.functions.Function1<? super java.util.List<? extends Value>,? extends java.util.List<? extends ToValue>> function);
-  }
-
-  @Deprecated public abstract static class ItemKeyedDataSource.LoadCallback<Value> {
-    ctor @Deprecated public ItemKeyedDataSource.LoadCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends Value> data);
-  }
-
-  @Deprecated public abstract static class ItemKeyedDataSource.LoadInitialCallback<Value> extends androidx.paging.ItemKeyedDataSource.LoadCallback<Value> {
-    ctor @Deprecated public ItemKeyedDataSource.LoadInitialCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends Value> data, int position, int totalCount);
-  }
-
-  @Deprecated public static class ItemKeyedDataSource.LoadInitialParams<Key> {
-    ctor @Deprecated public ItemKeyedDataSource.LoadInitialParams(Key? requestedInitialKey, int requestedLoadSize, boolean placeholdersEnabled);
-    field @Deprecated public final boolean placeholdersEnabled;
-    field @Deprecated public final Key? requestedInitialKey;
-    field @Deprecated public final int requestedLoadSize;
-  }
-
-  @Deprecated public static class ItemKeyedDataSource.LoadParams<Key> {
-    ctor @Deprecated public ItemKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
-    field @Deprecated public final Key key;
-    field @Deprecated public final int requestedLoadSize;
-  }
-
-  public final class ItemSnapshotList<T> extends kotlin.collections.AbstractList<T> {
-    ctor public ItemSnapshotList(@IntRange(from=0L) int placeholdersBefore, @IntRange(from=0L) int placeholdersAfter, java.util.List<? extends T> items);
-    method public T? get(int index);
-    method public java.util.List<T> getItems();
-    method public int getPlaceholdersAfter();
-    method public int getPlaceholdersBefore();
-    method public int getSize();
-    property public final java.util.List<T> items;
-    property public final int placeholdersAfter;
-    property public final int placeholdersBefore;
-    property public int size;
-  }
-
-  public abstract sealed class LoadState {
-    method public final boolean getEndOfPaginationReached();
-    property public final boolean endOfPaginationReached;
-  }
-
-  public static final class LoadState.Error extends androidx.paging.LoadState {
-    ctor public LoadState.Error(Throwable error);
-    method public Throwable getError();
-    property public final Throwable error;
-  }
-
-  public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading INSTANCE;
-  }
-
-  public static final class LoadState.NotLoading extends androidx.paging.LoadState {
-    ctor public LoadState.NotLoading(boolean endOfPaginationReached);
-  }
-
-  public final class LoadStates {
-    ctor public LoadStates(androidx.paging.LoadState refresh, androidx.paging.LoadState prepend, androidx.paging.LoadState append);
-    method public androidx.paging.LoadState component1();
-    method public androidx.paging.LoadState component2();
-    method public androidx.paging.LoadState component3();
-    method public androidx.paging.LoadStates copy(androidx.paging.LoadState refresh, androidx.paging.LoadState prepend, androidx.paging.LoadState append);
-    method public androidx.paging.LoadState getAppend();
-    method public androidx.paging.LoadState getPrepend();
-    method public androidx.paging.LoadState getRefresh();
-    property public final androidx.paging.LoadState append;
-    property public final androidx.paging.LoadState prepend;
-    property public final androidx.paging.LoadState refresh;
-  }
-
-  public enum LoadType {
-    method public static androidx.paging.LoadType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.paging.LoadType[] values();
-    enum_constant public static final androidx.paging.LoadType APPEND;
-    enum_constant public static final androidx.paging.LoadType PREPEND;
-    enum_constant public static final androidx.paging.LoadType REFRESH;
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface Logger {
-    method public boolean isLoggable(int level);
-    method public void log(int level, String message, optional Throwable? tr);
-  }
-
-  @Deprecated public abstract class PageKeyedDataSource<Key, Value> extends androidx.paging.DataSource<Key,Value> {
-    ctor @Deprecated public PageKeyedDataSource();
-    method @Deprecated public abstract void loadAfter(androidx.paging.PageKeyedDataSource.LoadParams<Key> params, androidx.paging.PageKeyedDataSource.LoadCallback<Key,Value> callback);
-    method @Deprecated public abstract void loadBefore(androidx.paging.PageKeyedDataSource.LoadParams<Key> params, androidx.paging.PageKeyedDataSource.LoadCallback<Key,Value> callback);
-    method @Deprecated public abstract void loadInitial(androidx.paging.PageKeyedDataSource.LoadInitialParams<Key> params, androidx.paging.PageKeyedDataSource.LoadInitialCallback<Key,Value> callback);
-    method @Deprecated public final <ToValue> androidx.paging.PageKeyedDataSource<Key,ToValue> map(androidx.arch.core.util.Function<Value,ToValue> function);
-    method @Deprecated public final <ToValue> androidx.paging.PageKeyedDataSource<Key,ToValue> map(kotlin.jvm.functions.Function1<? super Value,? extends ToValue> function);
-    method @Deprecated public final <ToValue> androidx.paging.PageKeyedDataSource<Key,ToValue> mapByPage(androidx.arch.core.util.Function<java.util.List<Value>,java.util.List<ToValue>> function);
-    method @Deprecated public final <ToValue> androidx.paging.PageKeyedDataSource<Key,ToValue> mapByPage(kotlin.jvm.functions.Function1<? super java.util.List<? extends Value>,? extends java.util.List<? extends ToValue>> function);
-  }
-
-  @Deprecated public abstract static class PageKeyedDataSource.LoadCallback<Key, Value> {
-    ctor @Deprecated public PageKeyedDataSource.LoadCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends Value> data, Key? adjacentPageKey);
-  }
-
-  @Deprecated public abstract static class PageKeyedDataSource.LoadInitialCallback<Key, Value> {
-    ctor @Deprecated public PageKeyedDataSource.LoadInitialCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends Value> data, int position, int totalCount, Key? previousPageKey, Key? nextPageKey);
-    method @Deprecated public abstract void onResult(java.util.List<? extends Value> data, Key? previousPageKey, Key? nextPageKey);
-  }
-
-  @Deprecated public static class PageKeyedDataSource.LoadInitialParams<Key> {
-    ctor @Deprecated public PageKeyedDataSource.LoadInitialParams(int requestedLoadSize, boolean placeholdersEnabled);
-    field @Deprecated public final boolean placeholdersEnabled;
-    field @Deprecated public final int requestedLoadSize;
-  }
-
-  @Deprecated public static class PageKeyedDataSource.LoadParams<Key> {
-    ctor @Deprecated public PageKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
-    field @Deprecated public final Key key;
-    field @Deprecated public final int requestedLoadSize;
-  }
-
-  @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
-    method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
-    method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
-    method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public abstract void detach();
-    method @Deprecated public T? get(int index);
-    method @Deprecated public final androidx.paging.PagedList.Config getConfig();
-    method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
-    method @Deprecated public abstract Object? getLastKey();
-    method @Deprecated public final int getLoadedCount();
-    method @Deprecated public final int getPositionOffset();
-    method @Deprecated public int getSize();
-    method @Deprecated public abstract boolean isDetached();
-    method @Deprecated public boolean isImmutable();
-    method @Deprecated public final void loadAround(int index);
-    method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
-    method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public void retry();
-    method @Deprecated public final java.util.List<T> snapshot();
-    property @Deprecated public final androidx.paging.PagedList.Config config;
-    property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
-    property @Deprecated public abstract boolean isDetached;
-    property @Deprecated public boolean isImmutable;
-    property @Deprecated public abstract Object? lastKey;
-    property @Deprecated public final int loadedCount;
-    property @Deprecated public final int positionOffset;
-    property @Deprecated public int size;
-  }
-
-  @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
-    ctor @Deprecated public PagedList.BoundaryCallback();
-    method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
-    method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
-    method @Deprecated public void onZeroItemsLoaded();
-  }
-
-  @Deprecated public static final class PagedList.Builder<Key, Value> {
-    ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
-    ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
-    method @Deprecated public androidx.paging.PagedList<Value> build();
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
-    method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
-  }
-
-  @Deprecated public abstract static class PagedList.Callback {
-    ctor @Deprecated public PagedList.Callback();
-    method @Deprecated public abstract void onChanged(int position, int count);
-    method @Deprecated public abstract void onInserted(int position, int count);
-    method @Deprecated public abstract void onRemoved(int position, int count);
-  }
-
-  @Deprecated public static final class PagedList.Config {
-    field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
-    field @Deprecated public final boolean enablePlaceholders;
-    field @Deprecated public final int initialLoadSizeHint;
-    field @Deprecated public final int maxSize;
-    field @Deprecated public final int pageSize;
-    field @Deprecated public final int prefetchDistance;
-  }
-
-  @Deprecated public static final class PagedList.Config.Builder {
-    ctor @Deprecated public PagedList.Config.Builder();
-    method @Deprecated public androidx.paging.PagedList.Config build();
-    method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
-    method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1L) int initialLoadSizeHint);
-    method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2L) int maxSize);
-    method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1L) int pageSize);
-    method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0L) int prefetchDistance);
-  }
-
-  public final class PagedListConfigKt {
-    method @kotlin.jvm.JvmSynthetic public static androidx.paging.PagedList.Config Config(int pageSize, optional int prefetchDistance, optional boolean enablePlaceholders, optional int initialLoadSizeHint, optional int maxSize);
-  }
-
-  public final class PagedListKt {
-    method @Deprecated @kotlin.jvm.JvmSynthetic public static <Key extends java.lang.Object, Value> androidx.paging.PagedList<Value> PagedList(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config, java.util.concurrent.Executor notifyExecutor, java.util.concurrent.Executor fetchExecutor, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional Key? initialKey);
-  }
-
-  public final class Pager<Key, Value> {
-    ctor @androidx.paging.ExperimentalPagingApi public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, androidx.paging.RemoteMediator<Key,Value>? remoteMediator, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
-    ctor public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
-    ctor public Pager(androidx.paging.PagingConfig config, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
-    method public kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<Value>> getFlow();
-    property public final kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<Value>> flow;
-  }
-
-  public final class PagingConfig {
-    ctor public PagingConfig(int pageSize);
-    ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance);
-    ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders);
-    ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize);
-    ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize);
-    ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize, optional int jumpThreshold);
-    field public static final androidx.paging.PagingConfig.Companion Companion;
-    field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
-    field public final boolean enablePlaceholders;
-    field public final int initialLoadSize;
-    field public final int jumpThreshold;
-    field public final int maxSize;
-    field public final int pageSize;
-    field public final int prefetchDistance;
-  }
-
-  public static final class PagingConfig.Companion {
-  }
-
-  public final class PagingData<T> {
-    method public static <T> androidx.paging.PagingData<T> empty();
-    method public static <T> androidx.paging.PagingData<T> empty(androidx.paging.LoadStates sourceLoadStates);
-    method public static <T> androidx.paging.PagingData<T> empty(androidx.paging.LoadStates sourceLoadStates, optional androidx.paging.LoadStates? mediatorLoadStates);
-    method public static <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data);
-    method public static <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data, androidx.paging.LoadStates sourceLoadStates);
-    method public static <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data, androidx.paging.LoadStates sourceLoadStates, optional androidx.paging.LoadStates? mediatorLoadStates);
-    field public static final androidx.paging.PagingData.Companion Companion;
-  }
-
-  public static final class PagingData.Companion {
-    method public <T> androidx.paging.PagingData<T> empty();
-    method public <T> androidx.paging.PagingData<T> empty(androidx.paging.LoadStates sourceLoadStates);
-    method public <T> androidx.paging.PagingData<T> empty(androidx.paging.LoadStates sourceLoadStates, optional androidx.paging.LoadStates? mediatorLoadStates);
-    method public <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data);
-    method public <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data, androidx.paging.LoadStates sourceLoadStates);
-    method public <T> androidx.paging.PagingData<T> from(java.util.List<? extends T> data, androidx.paging.LoadStates sourceLoadStates, optional androidx.paging.LoadStates? mediatorLoadStates);
-  }
-
-  public final class PagingDataTransforms {
-    method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, java.util.concurrent.Executor executor, kotlin.jvm.functions.Function1<? super T,java.lang.Boolean> predicate);
-    method @CheckResult @kotlin.jvm.JvmSynthetic public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super java.lang.Boolean>,?> predicate);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, java.util.concurrent.Executor executor, kotlin.jvm.functions.Function1<? super T,? extends java.lang.Iterable<? extends R>> transform);
-    method @CheckResult @kotlin.jvm.JvmSynthetic public static <T extends java.lang.Object, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super java.lang.Iterable<? extends R>>,?> transform);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> insertFooterItem(androidx.paging.PagingData<T>, optional androidx.paging.TerminalSeparatorType terminalSeparatorType, T item);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> insertFooterItem(androidx.paging.PagingData<T>, T item);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> insertHeaderItem(androidx.paging.PagingData<T>, optional androidx.paging.TerminalSeparatorType terminalSeparatorType, T item);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> insertHeaderItem(androidx.paging.PagingData<T>, T item);
-    method @CheckResult public static <R, T extends R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, optional androidx.paging.TerminalSeparatorType terminalSeparatorType, java.util.concurrent.Executor executor, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
-    method @CheckResult @kotlin.jvm.JvmSynthetic public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, optional androidx.paging.TerminalSeparatorType terminalSeparatorType, kotlin.jvm.functions.Function3<? super T,? super T,? super kotlin.coroutines.Continuation<? super R>,?> generator);
-    method @CheckResult public static <R, T extends R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, java.util.concurrent.Executor executor, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> map(androidx.paging.PagingData<T>, java.util.concurrent.Executor executor, kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    method @CheckResult @kotlin.jvm.JvmSynthetic public static <T extends java.lang.Object, R> androidx.paging.PagingData<R> map(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function2<? super T,? super kotlin.coroutines.Continuation<? super R>,?> transform);
-  }
-
-  public abstract class PagingSource<Key, Value> {
-    ctor public PagingSource();
-    method public final boolean getInvalid();
-    method public boolean getJumpingSupported();
-    method public boolean getKeyReuseSupported();
-    method public abstract Key? getRefreshKey(androidx.paging.PagingState<Key,Value> state);
-    method public final void invalidate();
-    method public abstract suspend Object? load(androidx.paging.PagingSource.LoadParams<Key> params, kotlin.coroutines.Continuation<? super androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public final void registerInvalidatedCallback(kotlin.jvm.functions.Function0<kotlin.Unit> onInvalidatedCallback);
-    method public final void unregisterInvalidatedCallback(kotlin.jvm.functions.Function0<kotlin.Unit> onInvalidatedCallback);
-    property public final boolean invalid;
-    property public boolean jumpingSupported;
-    property public boolean keyReuseSupported;
-  }
-
-  public abstract static sealed class PagingSource.LoadParams<Key> {
-    method public abstract Key? getKey();
-    method public final int getLoadSize();
-    method public final boolean getPlaceholdersEnabled();
-    property public abstract Key? key;
-    property public final int loadSize;
-    property public final boolean placeholdersEnabled;
-  }
-
-  public static final class PagingSource.LoadParams.Append<Key> extends androidx.paging.PagingSource.LoadParams<Key> {
-    ctor public PagingSource.LoadParams.Append(Key key, int loadSize, boolean placeholdersEnabled);
-    method public Key getKey();
-    property public Key key;
-  }
-
-  public static final class PagingSource.LoadParams.Prepend<Key> extends androidx.paging.PagingSource.LoadParams<Key> {
-    ctor public PagingSource.LoadParams.Prepend(Key key, int loadSize, boolean placeholdersEnabled);
-    method public Key getKey();
-    property public Key key;
-  }
-
-  public static final class PagingSource.LoadParams.Refresh<Key> extends androidx.paging.PagingSource.LoadParams<Key> {
-    ctor public PagingSource.LoadParams.Refresh(Key? key, int loadSize, boolean placeholdersEnabled);
-    method public Key? getKey();
-    property public Key? key;
-  }
-
-  public abstract static sealed class PagingSource.LoadResult<Key, Value> {
-  }
-
-  public static final class PagingSource.LoadResult.Error<Key, Value> extends androidx.paging.PagingSource.LoadResult<Key,Value> {
-    ctor public PagingSource.LoadResult.Error(Throwable throwable);
-    method public Throwable component1();
-    method public androidx.paging.PagingSource.LoadResult.Error<Key,Value> copy(Throwable throwable);
-    method public Throwable getThrowable();
-    property public final Throwable throwable;
-  }
-
-  public static final class PagingSource.LoadResult.Invalid<Key, Value> extends androidx.paging.PagingSource.LoadResult<Key,Value> {
-    ctor public PagingSource.LoadResult.Invalid();
-  }
-
-  public static final class PagingSource.LoadResult.Page<Key, Value> extends androidx.paging.PagingSource.LoadResult<Key,Value> implements java.lang.Iterable<Value> kotlin.jvm.internal.markers.KMappedMarker {
-    ctor public PagingSource.LoadResult.Page(java.util.List<? extends Value> data, Key? prevKey, Key? nextKey);
-    ctor public PagingSource.LoadResult.Page(java.util.List<? extends Value> data, Key? prevKey, Key? nextKey, optional @IntRange(from=androidx.paging.PagingSource.LoadResult.Page.COUNT_UNDEFINED.toLong()) int itemsBefore, optional @IntRange(from=androidx.paging.PagingSource.LoadResult.Page.COUNT_UNDEFINED.toLong()) int itemsAfter);
-    method public java.util.List<Value> component1();
-    method public Key? component2();
-    method public Key? component3();
-    method public int component4();
-    method public int component5();
-    method public androidx.paging.PagingSource.LoadResult.Page<Key,Value> copy(java.util.List<? extends Value> data, Key? prevKey, Key? nextKey, @IntRange(from=-2147483648L) int itemsBefore, @IntRange(from=-2147483648L) int itemsAfter);
-    method public java.util.List<Value> getData();
-    method public int getItemsAfter();
-    method public int getItemsBefore();
-    method public Key? getNextKey();
-    method public Key? getPrevKey();
-    method public java.util.Iterator<Value> iterator();
-    property public final java.util.List<Value> data;
-    property public final int itemsAfter;
-    property public final int itemsBefore;
-    property public final Key? nextKey;
-    property public final Key? prevKey;
-    field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
-  }
-
-  public static final class PagingSource.LoadResult.Page.Companion {
-  }
-
-  public fun interface PagingSourceFactory<Key, Value> extends kotlin.jvm.functions.Function0<androidx.paging.PagingSource<Key,Value>> {
-    method public operator androidx.paging.PagingSource<Key,Value> invoke();
-  }
-
-  public final class PagingState<Key, Value> {
-    ctor public PagingState(java.util.List<androidx.paging.PagingSource.LoadResult.Page<Key,Value>> pages, Integer? anchorPosition, androidx.paging.PagingConfig config, @IntRange(from=0L) int leadingPlaceholderCount);
-    method public Value? closestItemToPosition(int anchorPosition);
-    method public androidx.paging.PagingSource.LoadResult.Page<Key,Value>? closestPageToPosition(int anchorPosition);
-    method public Value? firstItemOrNull();
-    method public Integer? getAnchorPosition();
-    method public androidx.paging.PagingConfig getConfig();
-    method public java.util.List<androidx.paging.PagingSource.LoadResult.Page<Key,Value>> getPages();
-    method public boolean isEmpty();
-    method public Value? lastItemOrNull();
-    property public final Integer? anchorPosition;
-    property public final androidx.paging.PagingConfig config;
-    property public final java.util.List<androidx.paging.PagingSource.LoadResult.Page<Key,Value>> pages;
-  }
-
-  @Deprecated public abstract class PositionalDataSource<T> extends androidx.paging.DataSource<java.lang.Integer,T> {
-    ctor @Deprecated public PositionalDataSource();
-    method @Deprecated public static final int computeInitialLoadPosition(androidx.paging.PositionalDataSource.LoadInitialParams params, int totalCount);
-    method @Deprecated public static final int computeInitialLoadSize(androidx.paging.PositionalDataSource.LoadInitialParams params, int initialLoadPosition, int totalCount);
-    method @Deprecated @WorkerThread public abstract void loadInitial(androidx.paging.PositionalDataSource.LoadInitialParams params, androidx.paging.PositionalDataSource.LoadInitialCallback<T> callback);
-    method @Deprecated @WorkerThread public abstract void loadRange(androidx.paging.PositionalDataSource.LoadRangeParams params, androidx.paging.PositionalDataSource.LoadRangeCallback<T> callback);
-    method @Deprecated public final <V> androidx.paging.PositionalDataSource<V> map(androidx.arch.core.util.Function<T,V> function);
-    method @Deprecated public final <V> androidx.paging.PositionalDataSource<V> map(kotlin.jvm.functions.Function1<? super T,? extends V> function);
-    method @Deprecated public final <V> androidx.paging.PositionalDataSource<V> mapByPage(androidx.arch.core.util.Function<java.util.List<T>,java.util.List<V>> function);
-    method @Deprecated public final <V> androidx.paging.PositionalDataSource<V> mapByPage(kotlin.jvm.functions.Function1<? super java.util.List<? extends T>,? extends java.util.List<? extends V>> function);
-  }
-
-  @Deprecated public abstract static class PositionalDataSource.LoadInitialCallback<T> {
-    ctor @Deprecated public PositionalDataSource.LoadInitialCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends T> data, int position);
-    method @Deprecated public abstract void onResult(java.util.List<? extends T> data, int position, int totalCount);
-  }
-
-  @Deprecated public static class PositionalDataSource.LoadInitialParams {
-    ctor @Deprecated public PositionalDataSource.LoadInitialParams(int requestedStartPosition, int requestedLoadSize, int pageSize, boolean placeholdersEnabled);
-    field @Deprecated public final int pageSize;
-    field @Deprecated public final boolean placeholdersEnabled;
-    field @Deprecated public final int requestedLoadSize;
-    field @Deprecated public final int requestedStartPosition;
-  }
-
-  @Deprecated public abstract static class PositionalDataSource.LoadRangeCallback<T> {
-    ctor @Deprecated public PositionalDataSource.LoadRangeCallback();
-    method @Deprecated public abstract void onResult(java.util.List<? extends T> data);
-  }
-
-  @Deprecated public static class PositionalDataSource.LoadRangeParams {
-    ctor @Deprecated public PositionalDataSource.LoadRangeParams(int startPosition, int loadSize);
-    field @Deprecated public final int loadSize;
-    field @Deprecated public final int startPosition;
-  }
-
-  @androidx.paging.ExperimentalPagingApi public abstract class RemoteMediator<Key, Value> {
-    ctor public RemoteMediator();
-    method public suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
-    method public abstract suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
-  }
-
-  public enum RemoteMediator.InitializeAction {
-    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
-    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
-    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
-  }
-
-  public abstract static sealed class RemoteMediator.MediatorResult {
-  }
-
-  public static final class RemoteMediator.MediatorResult.Error extends androidx.paging.RemoteMediator.MediatorResult {
-    ctor public RemoteMediator.MediatorResult.Error(Throwable throwable);
-    method public Throwable getThrowable();
-    property public final Throwable throwable;
-  }
-
-  public static final class RemoteMediator.MediatorResult.Success extends androidx.paging.RemoteMediator.MediatorResult {
-    ctor public RemoteMediator.MediatorResult.Success(boolean endOfPaginationReached);
-    method public boolean getEndOfPaginationReached();
-    property public final boolean endOfPaginationReached;
-  }
-
-  public enum TerminalSeparatorType {
-    method public static androidx.paging.TerminalSeparatorType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.paging.TerminalSeparatorType[] values();
-    enum_constant public static final androidx.paging.TerminalSeparatorType FULLY_COMPLETE;
-    enum_constant public static final androidx.paging.TerminalSeparatorType SOURCE_COMPLETE;
-  }
-
-}
-
diff --git a/paging/paging-common/api/restricted_current.txt b/paging/paging-common/api/restricted_current.txt
index ffc28e1..a9a0517 100644
--- a/paging/paging-common/api/restricted_current.txt
+++ b/paging/paging-common/api/restricted_current.txt
@@ -46,6 +46,9 @@
     method @AnyThread public void onInvalidated();
   }
 
+  @kotlin.RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalPagingApi {
+  }
+
   public final class InvalidatingPagingSourceFactory<Key, Value> implements androidx.paging.PagingSourceFactory<Key,Value> {
     ctor public InvalidatingPagingSourceFactory(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     method public void invalidate();
@@ -266,6 +269,7 @@
   }
 
   public final class Pager<Key, Value> {
+    ctor @androidx.paging.ExperimentalPagingApi public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, androidx.paging.RemoteMediator<Key,Value>? remoteMediator, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     ctor public Pager(androidx.paging.PagingConfig config, optional Key? initialKey, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     ctor public Pager(androidx.paging.PagingConfig config, kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory);
     method public kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<Value>> getFlow();
@@ -467,6 +471,34 @@
     field @Deprecated public final int startPosition;
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RemoteMediator<Key, Value> {
+    ctor public RemoteMediator();
+    method public suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public abstract suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+  }
+
+  public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
+    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
+    enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
+  }
+
+  public abstract static sealed class RemoteMediator.MediatorResult {
+  }
+
+  public static final class RemoteMediator.MediatorResult.Error extends androidx.paging.RemoteMediator.MediatorResult {
+    ctor public RemoteMediator.MediatorResult.Error(Throwable throwable);
+    method public Throwable getThrowable();
+    property public final Throwable throwable;
+  }
+
+  public static final class RemoteMediator.MediatorResult.Success extends androidx.paging.RemoteMediator.MediatorResult {
+    ctor public RemoteMediator.MediatorResult.Success(boolean endOfPaginationReached);
+    method public boolean getEndOfPaginationReached();
+    property public final boolean endOfPaginationReached;
+  }
+
   public enum TerminalSeparatorType {
     method public static androidx.paging.TerminalSeparatorType valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
     method public static androidx.paging.TerminalSeparatorType[] values();
diff --git a/paging/paging-compose/api/public_plus_experimental_current.txt b/paging/paging-compose/api/public_plus_experimental_current.txt
deleted file mode 100644
index 79638bd..0000000
--- a/paging/paging-compose/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-// Signature format: 4.0
-package androidx.paging.compose {
-
-  public final class LazyFoundationExtensionsKt {
-    method public static <T> kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object> itemContentType(androidx.paging.compose.LazyPagingItems<T>, optional kotlin.jvm.functions.Function1<T,?>? contentType);
-    method public static <T> kotlin.jvm.functions.Function1<java.lang.Integer,java.lang.Object> itemKey(androidx.paging.compose.LazyPagingItems<T>, optional kotlin.jvm.functions.Function1<T,?>? key);
-  }
-
-  public final class LazyPagingItems<T> {
-    method public operator T? get(int index);
-    method public int getItemCount();
-    method public androidx.paging.ItemSnapshotList<T> getItemSnapshotList();
-    method public androidx.paging.CombinedLoadStates getLoadState();
-    method public T? peek(int index);
-    method public void refresh();
-    method public void retry();
-    property public final int itemCount;
-    property public final androidx.paging.ItemSnapshotList<T> itemSnapshotList;
-    property public final androidx.paging.CombinedLoadStates loadState;
-  }
-
-  public final class LazyPagingItemsKt {
-    method @androidx.compose.runtime.Composable public static <T> androidx.paging.compose.LazyPagingItems<T> collectAsLazyPagingItems(kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<T>>, optional kotlin.coroutines.CoroutineContext context);
-    method @Deprecated public static <T> void items(androidx.compose.foundation.lazy.LazyListScope, androidx.paging.compose.LazyPagingItems<T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?>? contentType, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.lazy.LazyItemScope,? super T,kotlin.Unit> itemContent);
-    method @Deprecated public static <T> void itemsIndexed(androidx.compose.foundation.lazy.LazyListScope, androidx.paging.compose.LazyPagingItems<T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? contentType, kotlin.jvm.functions.Function3<? super androidx.compose.foundation.lazy.LazyItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
-  }
-
-}
-
diff --git a/paging/paging-guava/api/current.txt b/paging/paging-guava/api/current.txt
index f5fb08d..7a925fd 100644
--- a/paging/paging-guava/api/current.txt
+++ b/paging/paging-guava/api/current.txt
@@ -18,6 +18,14 @@
     method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.PagingSource.LoadResult<Key,Value>> loadFuture(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class ListenableFutureRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public ListenableFutureRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.InitializeAction> initializeFuture();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.MediatorResult> loadFuture(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
   public final class PagingDataFutures {
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Boolean> predicate, java.util.concurrent.Executor executor);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Iterable<R>> transform, java.util.concurrent.Executor executor);
diff --git a/paging/paging-guava/api/public_plus_experimental_current.txt b/paging/paging-guava/api/public_plus_experimental_current.txt
deleted file mode 100644
index 7a925fd..0000000
--- a/paging/paging-guava/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-// Signature format: 4.0
-package androidx.paging {
-
-  public final class AdjacentItems<T> {
-    ctor public AdjacentItems(T? before, T? after);
-    method public T? component1();
-    method public T? component2();
-    method public androidx.paging.AdjacentItems<T> copy(T? before, T? after);
-    method public T? getAfter();
-    method public T? getBefore();
-    property public final T? after;
-    property public final T? before;
-  }
-
-  public abstract class ListenableFuturePagingSource<Key, Value> extends androidx.paging.PagingSource<Key,Value> {
-    ctor public ListenableFuturePagingSource();
-    method public suspend Object? load(androidx.paging.PagingSource.LoadParams<Key> params, kotlin.coroutines.Continuation<? super androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.PagingSource.LoadResult<Key,Value>> loadFuture(androidx.paging.PagingSource.LoadParams<Key> params);
-  }
-
-  @androidx.paging.ExperimentalPagingApi public abstract class ListenableFutureRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
-    ctor public ListenableFutureRemoteMediator();
-    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.InitializeAction> initializeFuture();
-    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.MediatorResult> loadFuture(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
-  }
-
-  public final class PagingDataFutures {
-    method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Boolean> predicate, java.util.concurrent.Executor executor);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Iterable<R>> transform, java.util.concurrent.Executor executor);
-    method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<androidx.paging.AdjacentItems<T>,R> generator, java.util.concurrent.Executor executor);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> map(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,R> transform, java.util.concurrent.Executor executor);
-  }
-
-}
-
diff --git a/paging/paging-guava/api/restricted_current.txt b/paging/paging-guava/api/restricted_current.txt
index f5fb08d..7a925fd 100644
--- a/paging/paging-guava/api/restricted_current.txt
+++ b/paging/paging-guava/api/restricted_current.txt
@@ -18,6 +18,14 @@
     method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.PagingSource.LoadResult<Key,Value>> loadFuture(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class ListenableFutureRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public ListenableFutureRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.InitializeAction> initializeFuture();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.paging.RemoteMediator.MediatorResult> loadFuture(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
   public final class PagingDataFutures {
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Boolean> predicate, java.util.concurrent.Executor executor);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, com.google.common.util.concurrent.AsyncFunction<T,java.lang.Iterable<R>> transform, java.util.concurrent.Executor executor);
diff --git a/paging/paging-runtime-ktx/api/public_plus_experimental_current.txt b/paging/paging-runtime-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/paging/paging-runtime-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/paging/paging-runtime/api/public_plus_experimental_current.txt b/paging/paging-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index ab368d2..0000000
--- a/paging/paging-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-// Signature format: 4.0
-package androidx.paging {
-
-  @Deprecated public class AsyncPagedListDiffer<T> {
-    ctor @Deprecated public AsyncPagedListDiffer(androidx.recyclerview.widget.ListUpdateCallback listUpdateCallback, androidx.recyclerview.widget.AsyncDifferConfig<T> config);
-    ctor @Deprecated public AsyncPagedListDiffer(androidx.recyclerview.widget.RecyclerView.Adapter<?> adapter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    method @Deprecated public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public void addPagedListListener(androidx.paging.AsyncPagedListDiffer.PagedListListener<T> listener);
-    method @Deprecated public final void addPagedListListener(kotlin.jvm.functions.Function2<? super androidx.paging.PagedList<T>,? super androidx.paging.PagedList<T>,kotlin.Unit> callback);
-    method @Deprecated public androidx.paging.PagedList<T>? getCurrentList();
-    method @Deprecated public T? getItem(int index);
-    method @Deprecated public int getItemCount();
-    method @Deprecated public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public void removePagedListListener(androidx.paging.AsyncPagedListDiffer.PagedListListener<T> listener);
-    method @Deprecated public final void removePagedListListener(kotlin.jvm.functions.Function2<? super androidx.paging.PagedList<T>,? super androidx.paging.PagedList<T>,kotlin.Unit> callback);
-    method @Deprecated public void submitList(androidx.paging.PagedList<T>? pagedList);
-    method @Deprecated public void submitList(androidx.paging.PagedList<T>? pagedList, Runnable? commitCallback);
-    property @Deprecated public androidx.paging.PagedList<T>? currentList;
-    property @Deprecated public int itemCount;
-  }
-
-  @Deprecated public static interface AsyncPagedListDiffer.PagedListListener<T> {
-    method @Deprecated public void onCurrentListChanged(androidx.paging.PagedList<T>? previousList, androidx.paging.PagedList<T>? currentList);
-  }
-
-  public final class AsyncPagingDataDiffer<T> {
-    ctor public AsyncPagingDataDiffer(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, androidx.recyclerview.widget.ListUpdateCallback updateCallback);
-    ctor public AsyncPagingDataDiffer(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, androidx.recyclerview.widget.ListUpdateCallback updateCallback, optional kotlin.coroutines.CoroutineContext mainDispatcher);
-    ctor public AsyncPagingDataDiffer(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, androidx.recyclerview.widget.ListUpdateCallback updateCallback, optional kotlin.coroutines.CoroutineContext mainDispatcher, optional kotlin.coroutines.CoroutineContext workerDispatcher);
-    ctor @Deprecated public AsyncPagingDataDiffer(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, androidx.recyclerview.widget.ListUpdateCallback updateCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher);
-    ctor @Deprecated public AsyncPagingDataDiffer(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, androidx.recyclerview.widget.ListUpdateCallback updateCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher, optional kotlinx.coroutines.CoroutineDispatcher workerDispatcher);
-    method public void addLoadStateListener(kotlin.jvm.functions.Function1<? super androidx.paging.CombinedLoadStates,kotlin.Unit> listener);
-    method public void addOnPagesUpdatedListener(kotlin.jvm.functions.Function0<kotlin.Unit> listener);
-    method @MainThread public T? getItem(@IntRange(from=0L) int index);
-    method public int getItemCount();
-    method public kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> getLoadStateFlow();
-    method public kotlinx.coroutines.flow.Flow<kotlin.Unit> getOnPagesUpdatedFlow();
-    method @MainThread public T? peek(@IntRange(from=0L) int index);
-    method public void refresh();
-    method public void removeLoadStateListener(kotlin.jvm.functions.Function1<? super androidx.paging.CombinedLoadStates,kotlin.Unit> listener);
-    method public void removeOnPagesUpdatedListener(kotlin.jvm.functions.Function0<kotlin.Unit> listener);
-    method public void retry();
-    method public androidx.paging.ItemSnapshotList<T> snapshot();
-    method public void submitData(androidx.lifecycle.Lifecycle lifecycle, androidx.paging.PagingData<T> pagingData);
-    method public suspend Object? submitData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    property public final int itemCount;
-    property public final kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> loadStateFlow;
-    property public final kotlinx.coroutines.flow.Flow<kotlin.Unit> onPagesUpdatedFlow;
-  }
-
-  @Deprecated public final class LivePagedListBuilder<Key, Value> {
-    ctor @Deprecated public LivePagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public LivePagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, int pageSize);
-    ctor @Deprecated public LivePagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public LivePagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, int pageSize);
-    method @Deprecated public androidx.lifecycle.LiveData<androidx.paging.PagedList<Value>> build();
-    method @Deprecated public androidx.paging.LivePagedListBuilder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
-    method @Deprecated public androidx.paging.LivePagedListBuilder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
-    method @Deprecated public androidx.paging.LivePagedListBuilder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
-    method @Deprecated public androidx.paging.LivePagedListBuilder<Key,Value> setInitialLoadKey(Key? key);
-  }
-
-  public final class LivePagedListKt {
-    method @Deprecated public static <Key, Value> androidx.lifecycle.LiveData<androidx.paging.PagedList<Value>> toLiveData(androidx.paging.DataSource.Factory<Key,Value>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional java.util.concurrent.Executor fetchExecutor);
-    method @Deprecated public static <Key, Value> androidx.lifecycle.LiveData<androidx.paging.PagedList<Value>> toLiveData(androidx.paging.DataSource.Factory<Key,Value>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional java.util.concurrent.Executor fetchExecutor);
-    method @Deprecated public static <Key, Value> androidx.lifecycle.LiveData<androidx.paging.PagedList<Value>> toLiveData(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional kotlinx.coroutines.CoroutineScope coroutineScope, optional kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
-    method @Deprecated public static <Key, Value> androidx.lifecycle.LiveData<androidx.paging.PagedList<Value>> toLiveData(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional kotlinx.coroutines.CoroutineScope coroutineScope, optional kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
-  }
-
-  public abstract class LoadStateAdapter<VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
-    ctor public LoadStateAdapter();
-    method public boolean displayLoadStateAsItem(androidx.paging.LoadState loadState);
-    method public final int getItemCount();
-    method public final int getItemViewType(int position);
-    method public final androidx.paging.LoadState getLoadState();
-    method public int getStateViewType(androidx.paging.LoadState loadState);
-    method public abstract void onBindViewHolder(VH holder, androidx.paging.LoadState loadState);
-    method public final void onBindViewHolder(VH holder, int position);
-    method public abstract VH onCreateViewHolder(android.view.ViewGroup parent, androidx.paging.LoadState loadState);
-    method public final VH onCreateViewHolder(android.view.ViewGroup parent, int viewType);
-    method public final void setLoadState(androidx.paging.LoadState);
-    property public final androidx.paging.LoadState loadState;
-  }
-
-  @Deprecated public abstract class PagedListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
-    ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T> config);
-    ctor @Deprecated protected PagedListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    method @Deprecated public void addLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public androidx.paging.PagedList<T>? getCurrentList();
-    method @Deprecated protected T? getItem(int position);
-    method @Deprecated public int getItemCount();
-    method @Deprecated public void onCurrentListChanged(androidx.paging.PagedList<T>? currentList);
-    method @Deprecated public void onCurrentListChanged(androidx.paging.PagedList<T>? previousList, androidx.paging.PagedList<T>? currentList);
-    method @Deprecated public void removeLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
-    method @Deprecated public void submitList(androidx.paging.PagedList<T>? pagedList);
-    method @Deprecated public void submitList(androidx.paging.PagedList<T>? pagedList, Runnable? commitCallback);
-    method @Deprecated public final androidx.recyclerview.widget.ConcatAdapter withLoadStateFooter(androidx.paging.LoadStateAdapter<?> footer);
-    method @Deprecated public final androidx.recyclerview.widget.ConcatAdapter withLoadStateHeader(androidx.paging.LoadStateAdapter<?> header);
-    method @Deprecated public final androidx.recyclerview.widget.ConcatAdapter withLoadStateHeaderAndFooter(androidx.paging.LoadStateAdapter<?> header, androidx.paging.LoadStateAdapter<?> footer);
-    property @Deprecated public androidx.paging.PagedList<T>? currentList;
-  }
-
-  public abstract class PagingDataAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlin.coroutines.CoroutineContext mainDispatcher);
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlin.coroutines.CoroutineContext mainDispatcher, optional kotlin.coroutines.CoroutineContext workerDispatcher);
-    ctor @Deprecated public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher);
-    ctor @Deprecated public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher, optional kotlinx.coroutines.CoroutineDispatcher workerDispatcher);
-    method public final void addLoadStateListener(kotlin.jvm.functions.Function1<? super androidx.paging.CombinedLoadStates,kotlin.Unit> listener);
-    method public final void addOnPagesUpdatedListener(kotlin.jvm.functions.Function0<kotlin.Unit> listener);
-    method @MainThread protected final T? getItem(@IntRange(from=0L) int position);
-    method public int getItemCount();
-    method public final long getItemId(int position);
-    method public final kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> getLoadStateFlow();
-    method public final kotlinx.coroutines.flow.Flow<kotlin.Unit> getOnPagesUpdatedFlow();
-    method @MainThread public final T? peek(@IntRange(from=0L) int index);
-    method public final void refresh();
-    method public final void removeLoadStateListener(kotlin.jvm.functions.Function1<? super androidx.paging.CombinedLoadStates,kotlin.Unit> listener);
-    method public final void removeOnPagesUpdatedListener(kotlin.jvm.functions.Function0<kotlin.Unit> listener);
-    method public final void retry();
-    method public final void setHasStableIds(boolean hasStableIds);
-    method public final androidx.paging.ItemSnapshotList<T> snapshot();
-    method public final void submitData(androidx.lifecycle.Lifecycle lifecycle, androidx.paging.PagingData<T> pagingData);
-    method public final suspend Object? submitData(androidx.paging.PagingData<T> pagingData, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public final androidx.recyclerview.widget.ConcatAdapter withLoadStateFooter(androidx.paging.LoadStateAdapter<?> footer);
-    method public final androidx.recyclerview.widget.ConcatAdapter withLoadStateHeader(androidx.paging.LoadStateAdapter<?> header);
-    method public final androidx.recyclerview.widget.ConcatAdapter withLoadStateHeaderAndFooter(androidx.paging.LoadStateAdapter<?> header, androidx.paging.LoadStateAdapter<?> footer);
-    property public final kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> loadStateFlow;
-    property public final kotlinx.coroutines.flow.Flow<kotlin.Unit> onPagesUpdatedFlow;
-  }
-
-  public final class PagingLiveData {
-    method public static <T> androidx.lifecycle.LiveData<androidx.paging.PagingData<T>> cachedIn(androidx.lifecycle.LiveData<androidx.paging.PagingData<T>>, androidx.lifecycle.Lifecycle lifecycle);
-    method public static <T> androidx.lifecycle.LiveData<androidx.paging.PagingData<T>> cachedIn(androidx.lifecycle.LiveData<androidx.paging.PagingData<T>>, androidx.lifecycle.ViewModel viewModel);
-    method public static <T> androidx.lifecycle.LiveData<androidx.paging.PagingData<T>> cachedIn(androidx.lifecycle.LiveData<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-    method public static <Key, Value> androidx.lifecycle.LiveData<androidx.paging.PagingData<Value>> getLiveData(androidx.paging.Pager<Key,Value>);
-  }
-
-}
-
diff --git a/paging/paging-rxjava2-ktx/api/public_plus_experimental_current.txt b/paging/paging-rxjava2-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/paging/paging-rxjava2-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/paging/paging-rxjava2/api/current.txt b/paging/paging-rxjava2/api/current.txt
index af9fd55..fb51a13 100644
--- a/paging/paging-rxjava2/api/current.txt
+++ b/paging/paging-rxjava2/api/current.txt
@@ -30,6 +30,8 @@
 package androidx.paging.rxjava2 {
 
   public final class PagingRx {
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Boolean>> predicate);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Iterable<R>>> transform);
     method public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
@@ -44,5 +46,13 @@
     method public abstract io.reactivex.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public RxRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public io.reactivex.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract io.reactivex.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
 }
 
diff --git a/paging/paging-rxjava2/api/public_plus_experimental_current.txt b/paging/paging-rxjava2/api/public_plus_experimental_current.txt
deleted file mode 100644
index fb51a13..0000000
--- a/paging/paging-rxjava2/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Signature format: 4.0
-package androidx.paging {
-
-  @Deprecated public final class RxPagedListBuilder<Key, Value> {
-    ctor @Deprecated public RxPagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public RxPagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, int pageSize);
-    ctor @Deprecated public RxPagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public RxPagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, int pageSize);
-    method @Deprecated public io.reactivex.Flowable<androidx.paging.PagedList<Value>> buildFlowable(io.reactivex.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public io.reactivex.Observable<androidx.paging.PagedList<Value>> buildObservable();
-    method @Deprecated public androidx.paging.RxPagedListBuilder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
-    method @Deprecated public androidx.paging.RxPagedListBuilder<Key,Value> setFetchScheduler(io.reactivex.Scheduler scheduler);
-    method @Deprecated public androidx.paging.RxPagedListBuilder<Key,Value> setInitialLoadKey(Key? key);
-    method @Deprecated public androidx.paging.RxPagedListBuilder<Key,Value> setNotifyScheduler(io.reactivex.Scheduler scheduler);
-  }
-
-  public final class RxPagedListKt {
-    method @Deprecated public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagedList<Value>> toFlowable(androidx.paging.DataSource.Factory<Key,Value>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler, optional io.reactivex.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagedList<Value>> toFlowable(androidx.paging.DataSource.Factory<Key,Value>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler, optional io.reactivex.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagedList<Value>> toFlowable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler, optional io.reactivex.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagedList<Value>> toFlowable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler, optional io.reactivex.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.Observable<androidx.paging.PagedList<Value>> toObservable(androidx.paging.DataSource.Factory<Key,Value>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.Observable<androidx.paging.PagedList<Value>> toObservable(androidx.paging.DataSource.Factory<Key,Value>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.Observable<androidx.paging.PagedList<Value>> toObservable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.Observable<androidx.paging.PagedList<Value>> toObservable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.Scheduler? fetchScheduler, optional io.reactivex.Scheduler? notifyScheduler);
-  }
-
-}
-
-package androidx.paging.rxjava2 {
-
-  public final class PagingRx {
-    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Boolean>> predicate);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Iterable<R>>> transform);
-    method public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
-    method public static <Key, Value> io.reactivex.Observable<androidx.paging.PagingData<Value>> getObservable(androidx.paging.Pager<Key,Value>);
-    method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function2<? super T,? super T,? extends io.reactivex.Maybe<R>> generator);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> map(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<R>> transform);
-  }
-
-  public abstract class RxPagingSource<Key, Value> extends androidx.paging.PagingSource<Key,Value> {
-    ctor public RxPagingSource();
-    method public final suspend Object? load(androidx.paging.PagingSource.LoadParams<Key> params, kotlin.coroutines.Continuation<? super androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public abstract io.reactivex.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
-  }
-
-  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
-    ctor public RxRemoteMediator();
-    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
-    method public io.reactivex.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
-    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
-    method public abstract io.reactivex.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
-  }
-
-}
-
diff --git a/paging/paging-rxjava2/api/restricted_current.txt b/paging/paging-rxjava2/api/restricted_current.txt
index af9fd55..fb51a13 100644
--- a/paging/paging-rxjava2/api/restricted_current.txt
+++ b/paging/paging-rxjava2/api/restricted_current.txt
@@ -30,6 +30,8 @@
 package androidx.paging.rxjava2 {
 
   public final class PagingRx {
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Boolean>> predicate);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.Single<java.lang.Iterable<R>>> transform);
     method public static <Key, Value> io.reactivex.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
@@ -44,5 +46,13 @@
     method public abstract io.reactivex.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public RxRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public io.reactivex.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract io.reactivex.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
 }
 
diff --git a/paging/paging-rxjava3/api/current.txt b/paging/paging-rxjava3/api/current.txt
index 4250689..e75fc6d 100644
--- a/paging/paging-rxjava3/api/current.txt
+++ b/paging/paging-rxjava3/api/current.txt
@@ -2,6 +2,8 @@
 package androidx.paging.rxjava3 {
 
   public final class PagingRx {
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Boolean>> predicate);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Iterable<R>>> transform);
     method public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
@@ -40,5 +42,13 @@
     method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public RxRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
 }
 
diff --git a/paging/paging-rxjava3/api/public_plus_experimental_current.txt b/paging/paging-rxjava3/api/public_plus_experimental_current.txt
deleted file mode 100644
index e75fc6d..0000000
--- a/paging/paging-rxjava3/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// Signature format: 4.0
-package androidx.paging.rxjava3 {
-
-  public final class PagingRx {
-    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
-    method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Boolean>> predicate);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Iterable<R>>> transform);
-    method public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
-    method public static <Key, Value> io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<Value>> getObservable(androidx.paging.Pager<Key,Value>);
-    method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function2<? super T,? super T,? extends io.reactivex.rxjava3.core.Maybe<R>> generator);
-    method @CheckResult public static <T, R> androidx.paging.PagingData<R> map(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<R>> transform);
-  }
-
-  @Deprecated public final class RxPagedListBuilder<Key, Value> {
-    ctor @Deprecated public RxPagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public RxPagedListBuilder(androidx.paging.DataSource.Factory<Key,Value> dataSourceFactory, int pageSize);
-    ctor @Deprecated public RxPagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, androidx.paging.PagedList.Config config);
-    ctor @Deprecated public RxPagedListBuilder(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>> pagingSourceFactory, int pageSize);
-    method @Deprecated public io.reactivex.rxjava3.core.Flowable<androidx.paging.PagedList<Value>> buildFlowable(io.reactivex.rxjava3.core.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public io.reactivex.rxjava3.core.Observable<androidx.paging.PagedList<Value>> buildObservable();
-    method @Deprecated public androidx.paging.rxjava3.RxPagedListBuilder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
-    method @Deprecated public androidx.paging.rxjava3.RxPagedListBuilder<Key,Value> setFetchScheduler(io.reactivex.rxjava3.core.Scheduler scheduler);
-    method @Deprecated public androidx.paging.rxjava3.RxPagedListBuilder<Key,Value> setInitialLoadKey(Key? key);
-    method @Deprecated public androidx.paging.rxjava3.RxPagedListBuilder<Key,Value> setNotifyScheduler(io.reactivex.rxjava3.core.Scheduler scheduler);
-  }
-
-  public final class RxPagedListKt {
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagedList<Value>> toFlowable(androidx.paging.DataSource.Factory<Key,Value>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler, optional io.reactivex.rxjava3.core.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagedList<Value>> toFlowable(androidx.paging.DataSource.Factory<Key,Value>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler, optional io.reactivex.rxjava3.core.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagedList<Value>> toFlowable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler, optional io.reactivex.rxjava3.core.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagedList<Value>> toFlowable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler, optional io.reactivex.rxjava3.core.BackpressureStrategy backpressureStrategy);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Observable<androidx.paging.PagedList<Value>> toObservable(androidx.paging.DataSource.Factory<Key,Value>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Observable<androidx.paging.PagedList<Value>> toObservable(androidx.paging.DataSource.Factory<Key,Value>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Observable<androidx.paging.PagedList<Value>> toObservable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, androidx.paging.PagedList.Config config, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler);
-    method @Deprecated public static <Key, Value> io.reactivex.rxjava3.core.Observable<androidx.paging.PagedList<Value>> toObservable(kotlin.jvm.functions.Function0<? extends androidx.paging.PagingSource<Key,Value>>, int pageSize, optional Key? initialLoadKey, optional androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback, optional io.reactivex.rxjava3.core.Scheduler? fetchScheduler, optional io.reactivex.rxjava3.core.Scheduler? notifyScheduler);
-  }
-
-  public abstract class RxPagingSource<Key, Value> extends androidx.paging.PagingSource<Key,Value> {
-    ctor public RxPagingSource();
-    method public final suspend Object? load(androidx.paging.PagingSource.LoadParams<Key> params, kotlin.coroutines.Continuation<? super androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
-  }
-
-  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
-    ctor public RxRemoteMediator();
-    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
-    method public io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
-    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
-    method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
-  }
-
-}
-
diff --git a/paging/paging-rxjava3/api/restricted_current.txt b/paging/paging-rxjava3/api/restricted_current.txt
index 4250689..e75fc6d 100644
--- a/paging/paging-rxjava3/api/restricted_current.txt
+++ b/paging/paging-rxjava3/api/restricted_current.txt
@@ -2,6 +2,8 @@
 package androidx.paging.rxjava3 {
 
   public final class PagingRx {
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>> cachedIn(io.reactivex.rxjava3.core.Observable<androidx.paging.PagingData<T>>, kotlinx.coroutines.CoroutineScope scope);
     method @CheckResult public static <T> androidx.paging.PagingData<T> filter(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Boolean>> predicate);
     method @CheckResult public static <T, R> androidx.paging.PagingData<R> flatMap(androidx.paging.PagingData<T>, kotlin.jvm.functions.Function1<? super T,? extends io.reactivex.rxjava3.core.Single<java.lang.Iterable<R>>> transform);
     method public static <Key, Value> io.reactivex.rxjava3.core.Flowable<androidx.paging.PagingData<Value>> getFlowable(androidx.paging.Pager<Key,Value>);
@@ -40,5 +42,13 @@
     method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.PagingSource.LoadResult<Key,Value>> loadSingle(androidx.paging.PagingSource.LoadParams<Key> params);
   }
 
+  @androidx.paging.ExperimentalPagingApi public abstract class RxRemoteMediator<Key, Value> extends androidx.paging.RemoteMediator<Key,Value> {
+    ctor public RxRemoteMediator();
+    method public final suspend Object? initialize(kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.InitializeAction>);
+    method public io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.InitializeAction> initializeSingle();
+    method public final suspend Object? load(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state, kotlin.coroutines.Continuation<? super androidx.paging.RemoteMediator.MediatorResult>);
+    method public abstract io.reactivex.rxjava3.core.Single<androidx.paging.RemoteMediator.MediatorResult> loadSingle(androidx.paging.LoadType loadType, androidx.paging.PagingState<Key,Value> state);
+  }
+
 }
 
diff --git a/paging/paging-testing/api/public_plus_experimental_current.txt b/paging/paging-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index 586efd3..0000000
--- a/paging/paging-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Signature format: 4.0
-package androidx.paging.testing {
-
-  public enum ErrorRecovery {
-    method public static androidx.paging.testing.ErrorRecovery valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.paging.testing.ErrorRecovery[] values();
-    enum_constant public static final androidx.paging.testing.ErrorRecovery RETRY;
-    enum_constant public static final androidx.paging.testing.ErrorRecovery RETURN_CURRENT_SNAPSHOT;
-    enum_constant public static final androidx.paging.testing.ErrorRecovery THROW;
-  }
-
-  public fun interface LoadErrorHandler {
-    method public androidx.paging.testing.ErrorRecovery onError(androidx.paging.CombinedLoadStates combinedLoadStates);
-  }
-
-  public final class PagerFlowSnapshotKt {
-    method public static suspend <Value> Object? asSnapshot(kotlinx.coroutines.flow.Flow<androidx.paging.PagingData<Value>>, optional androidx.paging.testing.LoadErrorHandler onError, optional kotlin.jvm.functions.Function2<? super androidx.paging.testing.SnapshotLoader<Value>,? super kotlin.coroutines.Continuation<kotlin.Unit>,?> loadOperations, optional kotlin.coroutines.Continuation<java.util.List<Value>>);
-  }
-
-  public final class SnapshotLoader<Value> {
-    method public suspend Object? appendScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
-    method public suspend Object? flingTo(int index, kotlin.coroutines.Continuation<kotlin.Unit>);
-    method public suspend Object? prependScrollWhile(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> predicate, kotlin.coroutines.Continuation<kotlin.Unit>);
-    method public suspend Object? refresh(kotlin.coroutines.Continuation<kotlin.Unit>);
-    method public suspend Object? scrollTo(int index, kotlin.coroutines.Continuation<kotlin.Unit>);
-  }
-
-  public final class StaticListPagingSourceFactoryKt {
-    method public static <Value> androidx.paging.PagingSourceFactory<java.lang.Integer,Value> asPagingSourceFactory(java.util.List<? extends Value>);
-    method public static <Value> androidx.paging.PagingSourceFactory<java.lang.Integer,Value> asPagingSourceFactory(kotlinx.coroutines.flow.Flow<java.util.List<Value>>, kotlinx.coroutines.CoroutineScope coroutineScope);
-  }
-
-  public final class TestPager<Key, Value> {
-    ctor public TestPager(androidx.paging.PagingConfig config, androidx.paging.PagingSource<Key,Value> pagingSource);
-    method public suspend Object? append(kotlin.coroutines.Continuation<androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public suspend Object? getLastLoadedPage(kotlin.coroutines.Continuation<androidx.paging.PagingSource.LoadResult.Page<Key,Value>>);
-    method public suspend Object? getPages(kotlin.coroutines.Continuation<java.util.List<androidx.paging.PagingSource.LoadResult.Page<Key,Value>>>);
-    method public suspend Object? getPagingState(int anchorPosition, kotlin.coroutines.Continuation<androidx.paging.PagingState<Key,Value>>);
-    method public suspend Object? getPagingState(kotlin.jvm.functions.Function1<Value,java.lang.Boolean> anchorPositionLookup, kotlin.coroutines.Continuation<androidx.paging.PagingState<Key,Value>>);
-    method public suspend Object? prepend(kotlin.coroutines.Continuation<androidx.paging.PagingSource.LoadResult<Key,Value>>);
-    method public suspend Object? refresh(optional Key? initialKey, optional kotlin.coroutines.Continuation<androidx.paging.PagingSource.LoadResult<Key,Value>>);
-  }
-
-}
-
diff --git a/palette/palette-ktx/api/public_plus_experimental_current.txt b/palette/palette-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 8015a8e..0000000
--- a/palette/palette-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.palette.graphics {
-
-  public final class PaletteKt {
-    method public static inline operator androidx.palette.graphics.Palette.Swatch? get(androidx.palette.graphics.Palette, androidx.palette.graphics.Target target);
-  }
-
-}
-
diff --git a/palette/palette/api/public_plus_experimental_current.txt b/palette/palette/api/public_plus_experimental_current.txt
deleted file mode 100644
index 0abc5a6..0000000
--- a/palette/palette/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-// Signature format: 4.0
-package androidx.palette.graphics {
-
-  public final class Palette {
-    method public static androidx.palette.graphics.Palette.Builder from(android.graphics.Bitmap);
-    method public static androidx.palette.graphics.Palette from(java.util.List<androidx.palette.graphics.Palette.Swatch!>);
-    method @Deprecated public static androidx.palette.graphics.Palette generate(android.graphics.Bitmap);
-    method @Deprecated public static androidx.palette.graphics.Palette generate(android.graphics.Bitmap, int);
-    method @Deprecated public static android.os.AsyncTask<android.graphics.Bitmap!,java.lang.Void!,androidx.palette.graphics.Palette!> generateAsync(android.graphics.Bitmap, androidx.palette.graphics.Palette.PaletteAsyncListener);
-    method @Deprecated public static android.os.AsyncTask<android.graphics.Bitmap!,java.lang.Void!,androidx.palette.graphics.Palette!> generateAsync(android.graphics.Bitmap, int, androidx.palette.graphics.Palette.PaletteAsyncListener);
-    method @ColorInt public int getColorForTarget(androidx.palette.graphics.Target, @ColorInt int);
-    method @ColorInt public int getDarkMutedColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getDarkMutedSwatch();
-    method @ColorInt public int getDarkVibrantColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getDarkVibrantSwatch();
-    method @ColorInt public int getDominantColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getDominantSwatch();
-    method @ColorInt public int getLightMutedColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getLightMutedSwatch();
-    method @ColorInt public int getLightVibrantColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getLightVibrantSwatch();
-    method @ColorInt public int getMutedColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getMutedSwatch();
-    method public androidx.palette.graphics.Palette.Swatch? getSwatchForTarget(androidx.palette.graphics.Target);
-    method public java.util.List<androidx.palette.graphics.Palette.Swatch!> getSwatches();
-    method public java.util.List<androidx.palette.graphics.Target!> getTargets();
-    method @ColorInt public int getVibrantColor(@ColorInt int);
-    method public androidx.palette.graphics.Palette.Swatch? getVibrantSwatch();
-  }
-
-  public static final class Palette.Builder {
-    ctor public Palette.Builder(android.graphics.Bitmap);
-    ctor public Palette.Builder(java.util.List<androidx.palette.graphics.Palette.Swatch!>);
-    method public androidx.palette.graphics.Palette.Builder addFilter(androidx.palette.graphics.Palette.Filter);
-    method public androidx.palette.graphics.Palette.Builder addTarget(androidx.palette.graphics.Target);
-    method public androidx.palette.graphics.Palette.Builder clearFilters();
-    method public androidx.palette.graphics.Palette.Builder clearRegion();
-    method public androidx.palette.graphics.Palette.Builder clearTargets();
-    method public androidx.palette.graphics.Palette generate();
-    method @Deprecated public android.os.AsyncTask<android.graphics.Bitmap!,java.lang.Void!,androidx.palette.graphics.Palette!> generate(androidx.palette.graphics.Palette.PaletteAsyncListener);
-    method public androidx.palette.graphics.Palette.Builder maximumColorCount(int);
-    method public androidx.palette.graphics.Palette.Builder resizeBitmapArea(int);
-    method @Deprecated public androidx.palette.graphics.Palette.Builder resizeBitmapSize(int);
-    method public androidx.palette.graphics.Palette.Builder setRegion(@Px int, @Px int, @Px int, @Px int);
-  }
-
-  public static interface Palette.Filter {
-    method public boolean isAllowed(@ColorInt int, float[]);
-  }
-
-  public static interface Palette.PaletteAsyncListener {
-    method public void onGenerated(androidx.palette.graphics.Palette?);
-  }
-
-  public static final class Palette.Swatch {
-    ctor public Palette.Swatch(@ColorInt int, int);
-    method @ColorInt public int getBodyTextColor();
-    method public float[] getHsl();
-    method public int getPopulation();
-    method @ColorInt public int getRgb();
-    method @ColorInt public int getTitleTextColor();
-  }
-
-  public final class Target {
-    method public float getLightnessWeight();
-    method @FloatRange(from=0, to=1) public float getMaximumLightness();
-    method @FloatRange(from=0, to=1) public float getMaximumSaturation();
-    method @FloatRange(from=0, to=1) public float getMinimumLightness();
-    method @FloatRange(from=0, to=1) public float getMinimumSaturation();
-    method public float getPopulationWeight();
-    method public float getSaturationWeight();
-    method @FloatRange(from=0, to=1) public float getTargetLightness();
-    method @FloatRange(from=0, to=1) public float getTargetSaturation();
-    method public boolean isExclusive();
-    field public static final androidx.palette.graphics.Target DARK_MUTED;
-    field public static final androidx.palette.graphics.Target DARK_VIBRANT;
-    field public static final androidx.palette.graphics.Target LIGHT_MUTED;
-    field public static final androidx.palette.graphics.Target LIGHT_VIBRANT;
-    field public static final androidx.palette.graphics.Target MUTED;
-    field public static final androidx.palette.graphics.Target VIBRANT;
-  }
-
-  public static final class Target.Builder {
-    ctor public Target.Builder();
-    ctor public Target.Builder(androidx.palette.graphics.Target);
-    method public androidx.palette.graphics.Target build();
-    method public androidx.palette.graphics.Target.Builder setExclusive(boolean);
-    method public androidx.palette.graphics.Target.Builder setLightnessWeight(@FloatRange(from=0) float);
-    method public androidx.palette.graphics.Target.Builder setMaximumLightness(@FloatRange(from=0, to=1) float);
-    method public androidx.palette.graphics.Target.Builder setMaximumSaturation(@FloatRange(from=0, to=1) float);
-    method public androidx.palette.graphics.Target.Builder setMinimumLightness(@FloatRange(from=0, to=1) float);
-    method public androidx.palette.graphics.Target.Builder setMinimumSaturation(@FloatRange(from=0, to=1) float);
-    method public androidx.palette.graphics.Target.Builder setPopulationWeight(@FloatRange(from=0) float);
-    method public androidx.palette.graphics.Target.Builder setSaturationWeight(@FloatRange(from=0) float);
-    method public androidx.palette.graphics.Target.Builder setTargetLightness(@FloatRange(from=0, to=1) float);
-    method public androidx.palette.graphics.Target.Builder setTargetSaturation(@FloatRange(from=0, to=1) float);
-  }
-
-}
-
diff --git a/percentlayout/percentlayout/api/public_plus_experimental_current.txt b/percentlayout/percentlayout/api/public_plus_experimental_current.txt
deleted file mode 100644
index ffe5f88..0000000
--- a/percentlayout/percentlayout/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-// Signature format: 4.0
-package androidx.percentlayout.widget {
-
-  @Deprecated public class PercentFrameLayout extends android.widget.FrameLayout {
-    ctor @Deprecated public PercentFrameLayout(android.content.Context!);
-    ctor @Deprecated public PercentFrameLayout(android.content.Context!, android.util.AttributeSet!);
-    ctor @Deprecated public PercentFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
-    method @Deprecated protected androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateDefaultLayoutParams();
-    method @Deprecated public androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-  }
-
-  @Deprecated public static class PercentFrameLayout.LayoutParams extends android.widget.FrameLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams!);
-    ctor @Deprecated @RequiresApi(19) public PercentFrameLayout.LayoutParams(androidx.percentlayout.widget.PercentFrameLayout.LayoutParams!);
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(int, int);
-    ctor @Deprecated public PercentFrameLayout.LayoutParams(int, int, int);
-    method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-  }
-
-  @Deprecated public class PercentLayoutHelper {
-    ctor @Deprecated public PercentLayoutHelper(android.view.ViewGroup);
-    method @Deprecated public void adjustChildren(int, int);
-    method @Deprecated public static void fetchWidthAndHeight(android.view.ViewGroup.LayoutParams!, android.content.res.TypedArray!, int, int);
-    method @Deprecated public static androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo(android.content.Context!, android.util.AttributeSet!);
-    method @Deprecated public boolean handleMeasuredStateTooSmall();
-    method @Deprecated public void restoreOriginalParams();
-  }
-
-  @Deprecated public static class PercentLayoutHelper.PercentLayoutInfo {
-    ctor @Deprecated public PercentLayoutHelper.PercentLayoutInfo();
-    method @Deprecated public void fillLayoutParams(android.view.ViewGroup.LayoutParams!, int, int);
-    method @Deprecated public void fillMarginLayoutParams(android.view.View!, android.view.ViewGroup.MarginLayoutParams!, int, int);
-    method @Deprecated public void fillMarginLayoutParams(android.view.ViewGroup.MarginLayoutParams!, int, int);
-    method @Deprecated public void restoreLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method @Deprecated public void restoreMarginLayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    field @Deprecated public float aspectRatio;
-    field @Deprecated public float bottomMarginPercent;
-    field @Deprecated public float endMarginPercent;
-    field @Deprecated public float heightPercent;
-    field @Deprecated public float leftMarginPercent;
-    field @Deprecated public float rightMarginPercent;
-    field @Deprecated public float startMarginPercent;
-    field @Deprecated public float topMarginPercent;
-    field @Deprecated public float widthPercent;
-  }
-
-  @Deprecated public static interface PercentLayoutHelper.PercentLayoutParams {
-    method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-  }
-
-  @Deprecated public class PercentRelativeLayout extends android.widget.RelativeLayout {
-    ctor @Deprecated public PercentRelativeLayout(android.content.Context!);
-    ctor @Deprecated public PercentRelativeLayout(android.content.Context!, android.util.AttributeSet!);
-    ctor @Deprecated public PercentRelativeLayout(android.content.Context!, android.util.AttributeSet!, int);
-    method @Deprecated protected androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateDefaultLayoutParams();
-    method @Deprecated public androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-  }
-
-  @Deprecated public static class PercentRelativeLayout.LayoutParams extends android.widget.RelativeLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
-    ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    ctor @Deprecated public PercentRelativeLayout.LayoutParams(int, int);
-    method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-  }
-
-}
-
diff --git a/playground-common/androidx-shared.properties b/playground-common/androidx-shared.properties
index 9a2aa06..5bfc174 100644
--- a/playground-common/androidx-shared.properties
+++ b/playground-common/androidx-shared.properties
@@ -62,8 +62,8 @@
 androidx.suppress.compatibility.optin.hijklm=h,i,j,k,l,m
 
 # Fourth stage of Suppress Compatibility migration
-androidx.suppress.compatibility.optout.nopqrst=navigation/navigation-ui/
-# androidx.suppress.compatibility.optin.nopqrst=n,o,p,q,r,s,t
+androidx.suppress.compatibility.optout.nopqrst=navigation/navigation-ui/,privacysandbox/ads/ads-adservices/,privacysandbox/sdkruntime/sdkruntime-client/,privacysandbox/sdkruntime/sdkruntime-core/,privacysandbox/ui/ui-client/,privacysandbox/ui/ui-core/,privacysandbox/ui/ui-provider/,transition/transition/
+androidx.suppress.compatibility.optin.nopqrst=n,o,p,q,r,s,t
 
 # Fifth stage of Suppress Compatibility migration
 androidx.suppress.compatibility.optout.uvwxyz=wear/compose/compose-foundation/,wear/protolayout/protolayout-expression/,wear/protolayout/protolayout-material/,wear/watchface/watchface-client/,window/window/,window/window-java/,window/extensions/extensions/,work/work-datatransfer/
diff --git a/preference/preference-ktx/api/public_plus_experimental_current.txt b/preference/preference-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index ab2f69a..0000000
--- a/preference/preference-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Signature format: 4.0
-package androidx.preference {
-
-  public final class PreferenceGroupKt {
-    method public static operator boolean contains(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static inline void forEach(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function1<? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static inline void forEachIndexed(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static operator androidx.preference.Preference get(androidx.preference.PreferenceGroup, int index);
-    method public static inline operator <T extends androidx.preference.Preference> T? get(androidx.preference.PreferenceGroup, CharSequence key);
-    method public static kotlin.sequences.Sequence<androidx.preference.Preference> getChildren(androidx.preference.PreferenceGroup);
-    method public static inline int getSize(androidx.preference.PreferenceGroup);
-    method public static inline boolean isEmpty(androidx.preference.PreferenceGroup);
-    method public static inline boolean isNotEmpty(androidx.preference.PreferenceGroup);
-    method public static operator java.util.Iterator<androidx.preference.Preference> iterator(androidx.preference.PreferenceGroup);
-    method public static inline operator void minusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static inline operator void plusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-  }
-
-}
-
diff --git a/preference/preference/api/public_plus_experimental_current.txt b/preference/preference/api/public_plus_experimental_current.txt
deleted file mode 100644
index dfbcf3b..0000000
--- a/preference/preference/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,562 +0,0 @@
-// Signature format: 4.0
-package androidx.preference {
-
-  public class CheckBoxPreference extends androidx.preference.TwoStatePreference {
-    ctor public CheckBoxPreference(android.content.Context);
-    ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public CheckBoxPreference(android.content.Context, android.util.AttributeSet?, int, int);
-  }
-
-  public abstract class DialogPreference extends androidx.preference.Preference {
-    ctor public DialogPreference(android.content.Context);
-    ctor public DialogPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public DialogPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public DialogPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public android.graphics.drawable.Drawable? getDialogIcon();
-    method public int getDialogLayoutResource();
-    method public CharSequence? getDialogMessage();
-    method public CharSequence? getDialogTitle();
-    method public CharSequence? getNegativeButtonText();
-    method public CharSequence? getPositiveButtonText();
-    method public void setDialogIcon(android.graphics.drawable.Drawable?);
-    method public void setDialogIcon(int);
-    method public void setDialogLayoutResource(int);
-    method public void setDialogMessage(int);
-    method public void setDialogMessage(CharSequence?);
-    method public void setDialogTitle(int);
-    method public void setDialogTitle(CharSequence?);
-    method public void setNegativeButtonText(int);
-    method public void setNegativeButtonText(CharSequence?);
-    method public void setPositiveButtonText(int);
-    method public void setPositiveButtonText(CharSequence?);
-  }
-
-  public static interface DialogPreference.TargetFragment {
-    method public <T extends androidx.preference.Preference> T? findPreference(CharSequence);
-  }
-
-  public class DropDownPreference extends androidx.preference.ListPreference {
-    ctor public DropDownPreference(android.content.Context);
-    ctor public DropDownPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public DropDownPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public DropDownPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method protected android.widget.ArrayAdapter createAdapter();
-  }
-
-  public class EditTextPreference extends androidx.preference.DialogPreference {
-    ctor public EditTextPreference(android.content.Context);
-    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public EditTextPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public String? getText();
-    method public void setOnBindEditTextListener(androidx.preference.EditTextPreference.OnBindEditTextListener?);
-    method public void setText(String?);
-  }
-
-  public static interface EditTextPreference.OnBindEditTextListener {
-    method public void onBindEditText(android.widget.EditText);
-  }
-
-  public static final class EditTextPreference.SimpleSummaryProvider implements androidx.preference.Preference.SummaryProvider<androidx.preference.EditTextPreference> {
-    method public static androidx.preference.EditTextPreference.SimpleSummaryProvider getInstance();
-    method public CharSequence? provideSummary(androidx.preference.EditTextPreference);
-  }
-
-  @Deprecated public class EditTextPreferenceDialogFragment extends androidx.preference.PreferenceDialogFragment {
-    ctor @Deprecated public EditTextPreferenceDialogFragment();
-    method @Deprecated public static androidx.preference.EditTextPreferenceDialogFragment newInstance(String!);
-    method @Deprecated protected void onBindDialogView(android.view.View);
-    method @Deprecated public void onDialogClosed(boolean);
-  }
-
-  public class EditTextPreferenceDialogFragmentCompat extends androidx.preference.PreferenceDialogFragmentCompat {
-    ctor public EditTextPreferenceDialogFragmentCompat();
-    method public static androidx.preference.EditTextPreferenceDialogFragmentCompat newInstance(String);
-    method public void onDialogClosed(boolean);
-  }
-
-  public class ListPreference extends androidx.preference.DialogPreference {
-    ctor public ListPreference(android.content.Context);
-    ctor public ListPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public ListPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public ListPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public int findIndexOfValue(String!);
-    method public CharSequence![]! getEntries();
-    method public CharSequence? getEntry();
-    method public CharSequence![]! getEntryValues();
-    method public String! getValue();
-    method public void setEntries(@ArrayRes int);
-    method public void setEntries(CharSequence![]!);
-    method public void setEntryValues(@ArrayRes int);
-    method public void setEntryValues(CharSequence![]!);
-    method public void setValue(String!);
-    method public void setValueIndex(int);
-  }
-
-  public static final class ListPreference.SimpleSummaryProvider implements androidx.preference.Preference.SummaryProvider<androidx.preference.ListPreference> {
-    method public static androidx.preference.ListPreference.SimpleSummaryProvider getInstance();
-    method public CharSequence? provideSummary(androidx.preference.ListPreference);
-  }
-
-  @Deprecated public class ListPreferenceDialogFragment extends androidx.preference.PreferenceDialogFragment {
-    ctor @Deprecated public ListPreferenceDialogFragment();
-    method @Deprecated public static androidx.preference.ListPreferenceDialogFragment newInstance(String!);
-    method @Deprecated public void onDialogClosed(boolean);
-    method @Deprecated protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder);
-  }
-
-  public class ListPreferenceDialogFragmentCompat extends androidx.preference.PreferenceDialogFragmentCompat {
-    ctor public ListPreferenceDialogFragmentCompat();
-    method public static androidx.preference.ListPreferenceDialogFragmentCompat newInstance(String);
-    method public void onDialogClosed(boolean);
-  }
-
-  public class MultiSelectListPreference extends androidx.preference.DialogPreference {
-    ctor public MultiSelectListPreference(android.content.Context);
-    ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public MultiSelectListPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public int findIndexOfValue(String!);
-    method public CharSequence![]! getEntries();
-    method public CharSequence![]! getEntryValues();
-    method protected boolean[]! getSelectedItems();
-    method public java.util.Set<java.lang.String!>! getValues();
-    method public void setEntries(@ArrayRes int);
-    method public void setEntries(CharSequence![]!);
-    method public void setEntryValues(@ArrayRes int);
-    method public void setEntryValues(CharSequence![]!);
-    method public void setValues(java.util.Set<java.lang.String!>!);
-  }
-
-  @Deprecated public class MultiSelectListPreferenceDialogFragment extends androidx.preference.PreferenceDialogFragment {
-    ctor @Deprecated public MultiSelectListPreferenceDialogFragment();
-    method @Deprecated public static androidx.preference.MultiSelectListPreferenceDialogFragment newInstance(String!);
-    method @Deprecated public void onDialogClosed(boolean);
-    method @Deprecated protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder);
-  }
-
-  public class MultiSelectListPreferenceDialogFragmentCompat extends androidx.preference.PreferenceDialogFragmentCompat {
-    ctor public MultiSelectListPreferenceDialogFragmentCompat();
-    method public static androidx.preference.MultiSelectListPreferenceDialogFragmentCompat newInstance(String);
-    method public void onDialogClosed(boolean);
-  }
-
-  public class Preference implements java.lang.Comparable<androidx.preference.Preference> {
-    ctor public Preference(android.content.Context);
-    ctor public Preference(android.content.Context, android.util.AttributeSet?);
-    ctor public Preference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public Preference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public boolean callChangeListener(Object!);
-    method public int compareTo(androidx.preference.Preference);
-    method protected <T extends androidx.preference.Preference> T? findPreferenceInHierarchy(String);
-    method public android.content.Context getContext();
-    method public String? getDependency();
-    method public android.os.Bundle getExtras();
-    method public String? getFragment();
-    method public android.graphics.drawable.Drawable? getIcon();
-    method public android.content.Intent? getIntent();
-    method public String! getKey();
-    method public final int getLayoutResource();
-    method public androidx.preference.Preference.OnPreferenceChangeListener? getOnPreferenceChangeListener();
-    method public androidx.preference.Preference.OnPreferenceClickListener? getOnPreferenceClickListener();
-    method public int getOrder();
-    method public androidx.preference.PreferenceGroup? getParent();
-    method protected boolean getPersistedBoolean(boolean);
-    method protected float getPersistedFloat(float);
-    method protected int getPersistedInt(int);
-    method protected long getPersistedLong(long);
-    method protected String! getPersistedString(String!);
-    method public java.util.Set<java.lang.String!>! getPersistedStringSet(java.util.Set<java.lang.String!>!);
-    method public androidx.preference.PreferenceDataStore? getPreferenceDataStore();
-    method public androidx.preference.PreferenceManager! getPreferenceManager();
-    method public android.content.SharedPreferences? getSharedPreferences();
-    method public boolean getShouldDisableView();
-    method public CharSequence? getSummary();
-    method public final androidx.preference.Preference.SummaryProvider? getSummaryProvider();
-    method public CharSequence? getTitle();
-    method public final int getWidgetLayoutResource();
-    method public boolean hasKey();
-    method public boolean isCopyingEnabled();
-    method public boolean isEnabled();
-    method public boolean isIconSpaceReserved();
-    method public boolean isPersistent();
-    method public boolean isSelectable();
-    method public final boolean isShown();
-    method public boolean isSingleLineTitle();
-    method public final boolean isVisible();
-    method protected void notifyChanged();
-    method public void notifyDependencyChange(boolean);
-    method protected void notifyHierarchyChanged();
-    method public void onAttached();
-    method protected void onAttachedToHierarchy(androidx.preference.PreferenceManager);
-    method public void onBindViewHolder(androidx.preference.PreferenceViewHolder);
-    method protected void onClick();
-    method public void onDependencyChanged(androidx.preference.Preference, boolean);
-    method public void onDetached();
-    method protected Object? onGetDefaultValue(android.content.res.TypedArray, int);
-    method @Deprecated @CallSuper public void onInitializeAccessibilityNodeInfo(androidx.core.view.accessibility.AccessibilityNodeInfoCompat!);
-    method public void onParentChanged(androidx.preference.Preference, boolean);
-    method protected void onPrepareForRemoval();
-    method protected void onRestoreInstanceState(android.os.Parcelable?);
-    method protected android.os.Parcelable? onSaveInstanceState();
-    method @Deprecated protected void onSetInitialValue(boolean, Object!);
-    method protected void onSetInitialValue(Object?);
-    method public android.os.Bundle? peekExtras();
-    method protected boolean persistBoolean(boolean);
-    method protected boolean persistFloat(float);
-    method protected boolean persistInt(int);
-    method protected boolean persistLong(long);
-    method protected boolean persistString(String!);
-    method public boolean persistStringSet(java.util.Set<java.lang.String!>!);
-    method public void restoreHierarchyState(android.os.Bundle);
-    method public void saveHierarchyState(android.os.Bundle);
-    method public void setCopyingEnabled(boolean);
-    method public void setDefaultValue(Object!);
-    method public void setDependency(String?);
-    method public void setEnabled(boolean);
-    method public void setFragment(String?);
-    method public void setIcon(android.graphics.drawable.Drawable?);
-    method public void setIcon(int);
-    method public void setIconSpaceReserved(boolean);
-    method public void setIntent(android.content.Intent?);
-    method public void setKey(String!);
-    method public void setLayoutResource(int);
-    method public void setOnPreferenceChangeListener(androidx.preference.Preference.OnPreferenceChangeListener?);
-    method public void setOnPreferenceClickListener(androidx.preference.Preference.OnPreferenceClickListener?);
-    method public void setOrder(int);
-    method public void setPersistent(boolean);
-    method public void setPreferenceDataStore(androidx.preference.PreferenceDataStore?);
-    method public void setSelectable(boolean);
-    method public void setShouldDisableView(boolean);
-    method public void setSingleLineTitle(boolean);
-    method public void setSummary(int);
-    method public void setSummary(CharSequence?);
-    method public final void setSummaryProvider(androidx.preference.Preference.SummaryProvider?);
-    method public void setTitle(int);
-    method public void setTitle(CharSequence?);
-    method public void setViewId(int);
-    method public final void setVisible(boolean);
-    method public void setWidgetLayoutResource(int);
-    method public boolean shouldDisableDependents();
-    method protected boolean shouldPersist();
-    field public static final int DEFAULT_ORDER = 2147483647; // 0x7fffffff
-  }
-
-  public static class Preference.BaseSavedState extends android.view.AbsSavedState {
-    ctor public Preference.BaseSavedState(android.os.Parcel!);
-    ctor public Preference.BaseSavedState(android.os.Parcelable!);
-    field public static final android.os.Parcelable.Creator<androidx.preference.Preference.BaseSavedState!> CREATOR;
-  }
-
-  public static interface Preference.OnPreferenceChangeListener {
-    method public boolean onPreferenceChange(androidx.preference.Preference, Object!);
-  }
-
-  public static interface Preference.OnPreferenceClickListener {
-    method public boolean onPreferenceClick(androidx.preference.Preference);
-  }
-
-  public static interface Preference.SummaryProvider<T extends androidx.preference.Preference> {
-    method public CharSequence? provideSummary(T);
-  }
-
-  public class PreferenceCategory extends androidx.preference.PreferenceGroup {
-    ctor public PreferenceCategory(android.content.Context);
-    ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet?);
-    ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet?, int);
-    ctor public PreferenceCategory(android.content.Context, android.util.AttributeSet?, int, int);
-  }
-
-  public abstract class PreferenceDataStore {
-    ctor public PreferenceDataStore();
-    method public boolean getBoolean(String, boolean);
-    method public float getFloat(String, float);
-    method public int getInt(String, int);
-    method public long getLong(String, long);
-    method public String? getString(String, String?);
-    method public java.util.Set<java.lang.String!>? getStringSet(String, java.util.Set<java.lang.String!>?);
-    method public void putBoolean(String, boolean);
-    method public void putFloat(String, float);
-    method public void putInt(String, int);
-    method public void putLong(String, long);
-    method public void putString(String, String?);
-    method public void putStringSet(String, java.util.Set<java.lang.String!>?);
-  }
-
-  @Deprecated public abstract class PreferenceDialogFragment extends android.app.DialogFragment implements android.content.DialogInterface.OnClickListener {
-    ctor @Deprecated public PreferenceDialogFragment();
-    method @Deprecated public androidx.preference.DialogPreference! getPreference();
-    method @Deprecated protected void onBindDialogView(android.view.View);
-    method @Deprecated public void onClick(android.content.DialogInterface, int);
-    method @Deprecated public void onCreate(android.os.Bundle?);
-    method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle?);
-    method @Deprecated protected android.view.View? onCreateDialogView(android.content.Context);
-    method @Deprecated public abstract void onDialogClosed(boolean);
-    method @Deprecated public void onDismiss(android.content.DialogInterface);
-    method @Deprecated protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle);
-    field @Deprecated protected static final String ARG_KEY = "key";
-  }
-
-  public abstract class PreferenceDialogFragmentCompat extends androidx.fragment.app.DialogFragment implements android.content.DialogInterface.OnClickListener {
-    ctor public PreferenceDialogFragmentCompat();
-    method public androidx.preference.DialogPreference! getPreference();
-    method protected void onBindDialogView(android.view.View);
-    method public void onClick(android.content.DialogInterface, int);
-    method protected android.view.View? onCreateDialogView(android.content.Context);
-    method public abstract void onDialogClosed(boolean);
-    method protected void onPrepareDialogBuilder(androidx.appcompat.app.AlertDialog.Builder);
-    field protected static final String ARG_KEY = "key";
-  }
-
-  @Deprecated public abstract class PreferenceFragment extends android.app.Fragment implements androidx.preference.DialogPreference.TargetFragment androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener androidx.preference.PreferenceManager.OnNavigateToScreenListener androidx.preference.PreferenceManager.OnPreferenceTreeClickListener {
-    ctor @Deprecated public PreferenceFragment();
-    method @Deprecated public void addPreferencesFromResource(@XmlRes int);
-    method @Deprecated public <T extends androidx.preference.Preference> T! findPreference(CharSequence);
-    method @Deprecated public final androidx.recyclerview.widget.RecyclerView! getListView();
-    method @Deprecated public androidx.preference.PreferenceManager! getPreferenceManager();
-    method @Deprecated public androidx.preference.PreferenceScreen! getPreferenceScreen();
-    method @Deprecated public void onCreate(android.os.Bundle?);
-    method @Deprecated protected androidx.recyclerview.widget.RecyclerView.Adapter onCreateAdapter(androidx.preference.PreferenceScreen);
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView.LayoutManager onCreateLayoutManager();
-    method @Deprecated public abstract void onCreatePreferences(android.os.Bundle?, String!);
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView onCreateRecyclerView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle?);
-    method @Deprecated public android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup?, android.os.Bundle?);
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onDisplayPreferenceDialog(androidx.preference.Preference);
-    method @Deprecated public void onNavigateToScreen(androidx.preference.PreferenceScreen);
-    method @Deprecated public boolean onPreferenceTreeClick(androidx.preference.Preference);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public void scrollToPreference(androidx.preference.Preference);
-    method @Deprecated public void scrollToPreference(String);
-    method @Deprecated public void setDivider(android.graphics.drawable.Drawable?);
-    method @Deprecated public void setDividerHeight(int);
-    method @Deprecated public void setPreferenceScreen(androidx.preference.PreferenceScreen!);
-    method @Deprecated public void setPreferencesFromResource(@XmlRes int, String?);
-    field @Deprecated public static final String ARG_PREFERENCE_ROOT = "androidx.preference.PreferenceFragmentCompat.PREFERENCE_ROOT";
-  }
-
-  @Deprecated public static interface PreferenceFragment.OnPreferenceDisplayDialogCallback {
-    method @Deprecated public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragment, androidx.preference.Preference);
-  }
-
-  @Deprecated public static interface PreferenceFragment.OnPreferenceStartFragmentCallback {
-    method @Deprecated public boolean onPreferenceStartFragment(androidx.preference.PreferenceFragment, androidx.preference.Preference);
-  }
-
-  @Deprecated public static interface PreferenceFragment.OnPreferenceStartScreenCallback {
-    method @Deprecated public boolean onPreferenceStartScreen(androidx.preference.PreferenceFragment, androidx.preference.PreferenceScreen);
-  }
-
-  public abstract class PreferenceFragmentCompat extends androidx.fragment.app.Fragment implements androidx.preference.DialogPreference.TargetFragment androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener androidx.preference.PreferenceManager.OnNavigateToScreenListener androidx.preference.PreferenceManager.OnPreferenceTreeClickListener {
-    ctor public PreferenceFragmentCompat();
-    method public void addPreferencesFromResource(@XmlRes int);
-    method public <T extends androidx.preference.Preference> T? findPreference(CharSequence);
-    method public final androidx.recyclerview.widget.RecyclerView! getListView();
-    method public androidx.preference.PreferenceManager! getPreferenceManager();
-    method public androidx.preference.PreferenceScreen! getPreferenceScreen();
-    method protected androidx.recyclerview.widget.RecyclerView.Adapter onCreateAdapter(androidx.preference.PreferenceScreen);
-    method public androidx.recyclerview.widget.RecyclerView.LayoutManager onCreateLayoutManager();
-    method public abstract void onCreatePreferences(android.os.Bundle?, String?);
-    method public androidx.recyclerview.widget.RecyclerView onCreateRecyclerView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle?);
-    method public void onDisplayPreferenceDialog(androidx.preference.Preference);
-    method public void onNavigateToScreen(androidx.preference.PreferenceScreen);
-    method public boolean onPreferenceTreeClick(androidx.preference.Preference);
-    method public void scrollToPreference(androidx.preference.Preference);
-    method public void scrollToPreference(String);
-    method public void setDivider(android.graphics.drawable.Drawable?);
-    method public void setDividerHeight(int);
-    method public void setPreferenceScreen(androidx.preference.PreferenceScreen!);
-    method public void setPreferencesFromResource(@XmlRes int, String?);
-    field public static final String ARG_PREFERENCE_ROOT = "androidx.preference.PreferenceFragmentCompat.PREFERENCE_ROOT";
-  }
-
-  public static interface PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback {
-    method public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragmentCompat, androidx.preference.Preference);
-  }
-
-  public static interface PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
-    method public boolean onPreferenceStartFragment(androidx.preference.PreferenceFragmentCompat, androidx.preference.Preference);
-  }
-
-  public static interface PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
-    method public boolean onPreferenceStartScreen(androidx.preference.PreferenceFragmentCompat, androidx.preference.PreferenceScreen);
-  }
-
-  public abstract class PreferenceGroup extends androidx.preference.Preference {
-    ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet?);
-    ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet?, int);
-    ctor public PreferenceGroup(android.content.Context, android.util.AttributeSet?, int, int);
-    method public void addItemFromInflater(androidx.preference.Preference);
-    method public boolean addPreference(androidx.preference.Preference);
-    method protected void dispatchRestoreInstanceState(android.os.Bundle);
-    method protected void dispatchSaveInstanceState(android.os.Bundle);
-    method public <T extends androidx.preference.Preference> T? findPreference(CharSequence);
-    method public int getInitialExpandedChildrenCount();
-    method public androidx.preference.Preference getPreference(int);
-    method public int getPreferenceCount();
-    method protected boolean isOnSameScreenAsChildren();
-    method public boolean isOrderingAsAdded();
-    method protected boolean onPrepareAddPreference(androidx.preference.Preference);
-    method public void removeAll();
-    method public boolean removePreference(androidx.preference.Preference);
-    method public boolean removePreferenceRecursively(CharSequence);
-    method public void setInitialExpandedChildrenCount(int);
-    method public void setOrderingAsAdded(boolean);
-  }
-
-  public static interface PreferenceGroup.PreferencePositionCallback {
-    method public int getPreferenceAdapterPosition(androidx.preference.Preference);
-    method public int getPreferenceAdapterPosition(String);
-  }
-
-  public abstract class PreferenceHeaderFragmentCompat extends androidx.fragment.app.Fragment implements androidx.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
-    ctor public PreferenceHeaderFragmentCompat();
-    method public final androidx.slidingpanelayout.widget.SlidingPaneLayout getSlidingPaneLayout();
-    method public androidx.fragment.app.Fragment? onCreateInitialDetailFragment();
-    method public abstract androidx.preference.PreferenceFragmentCompat onCreatePreferenceHeader();
-    method @CallSuper public boolean onPreferenceStartFragment(androidx.preference.PreferenceFragmentCompat caller, androidx.preference.Preference pref);
-    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout slidingPaneLayout;
-  }
-
-  public class PreferenceManager {
-    method public androidx.preference.PreferenceScreen createPreferenceScreen(android.content.Context);
-    method public <T extends androidx.preference.Preference> T? findPreference(CharSequence);
-    method public android.content.Context getContext();
-    method public static android.content.SharedPreferences! getDefaultSharedPreferences(android.content.Context);
-    method public androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener? getOnDisplayPreferenceDialogListener();
-    method public androidx.preference.PreferenceManager.OnNavigateToScreenListener? getOnNavigateToScreenListener();
-    method public androidx.preference.PreferenceManager.OnPreferenceTreeClickListener? getOnPreferenceTreeClickListener();
-    method public androidx.preference.PreferenceManager.PreferenceComparisonCallback? getPreferenceComparisonCallback();
-    method public androidx.preference.PreferenceDataStore? getPreferenceDataStore();
-    method public androidx.preference.PreferenceScreen! getPreferenceScreen();
-    method public android.content.SharedPreferences? getSharedPreferences();
-    method public int getSharedPreferencesMode();
-    method public String! getSharedPreferencesName();
-    method public boolean isStorageDefault();
-    method public boolean isStorageDeviceProtected();
-    method public static void setDefaultValues(android.content.Context, int, boolean);
-    method public static void setDefaultValues(android.content.Context, String!, int, int, boolean);
-    method public void setOnDisplayPreferenceDialogListener(androidx.preference.PreferenceManager.OnDisplayPreferenceDialogListener?);
-    method public void setOnNavigateToScreenListener(androidx.preference.PreferenceManager.OnNavigateToScreenListener?);
-    method public void setOnPreferenceTreeClickListener(androidx.preference.PreferenceManager.OnPreferenceTreeClickListener?);
-    method public void setPreferenceComparisonCallback(androidx.preference.PreferenceManager.PreferenceComparisonCallback?);
-    method public void setPreferenceDataStore(androidx.preference.PreferenceDataStore?);
-    method public boolean setPreferences(androidx.preference.PreferenceScreen!);
-    method public void setSharedPreferencesMode(int);
-    method public void setSharedPreferencesName(String!);
-    method public void setStorageDefault();
-    method public void setStorageDeviceProtected();
-    method public void showDialog(androidx.preference.Preference);
-    field public static final String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
-  }
-
-  public static interface PreferenceManager.OnDisplayPreferenceDialogListener {
-    method public void onDisplayPreferenceDialog(androidx.preference.Preference);
-  }
-
-  public static interface PreferenceManager.OnNavigateToScreenListener {
-    method public void onNavigateToScreen(androidx.preference.PreferenceScreen);
-  }
-
-  public static interface PreferenceManager.OnPreferenceTreeClickListener {
-    method public boolean onPreferenceTreeClick(androidx.preference.Preference);
-  }
-
-  public abstract static class PreferenceManager.PreferenceComparisonCallback {
-    ctor public PreferenceManager.PreferenceComparisonCallback();
-    method public abstract boolean arePreferenceContentsTheSame(androidx.preference.Preference, androidx.preference.Preference);
-    method public abstract boolean arePreferenceItemsTheSame(androidx.preference.Preference, androidx.preference.Preference);
-  }
-
-  public static class PreferenceManager.SimplePreferenceComparisonCallback extends androidx.preference.PreferenceManager.PreferenceComparisonCallback {
-    ctor public PreferenceManager.SimplePreferenceComparisonCallback();
-    method public boolean arePreferenceContentsTheSame(androidx.preference.Preference, androidx.preference.Preference);
-    method public boolean arePreferenceItemsTheSame(androidx.preference.Preference, androidx.preference.Preference);
-  }
-
-  public final class PreferenceScreen extends androidx.preference.PreferenceGroup {
-    method public void setShouldUseGeneratedIds(boolean);
-    method public boolean shouldUseGeneratedIds();
-  }
-
-  public class PreferenceViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder {
-    method public android.view.View! findViewById(@IdRes int);
-    method public boolean isDividerAllowedAbove();
-    method public boolean isDividerAllowedBelow();
-    method public void setDividerAllowedAbove(boolean);
-    method public void setDividerAllowedBelow(boolean);
-  }
-
-  public class SeekBarPreference extends androidx.preference.Preference {
-    ctor public SeekBarPreference(android.content.Context);
-    ctor public SeekBarPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public SeekBarPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public SeekBarPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public int getMax();
-    method public int getMin();
-    method public final int getSeekBarIncrement();
-    method public boolean getShowSeekBarValue();
-    method public boolean getUpdatesContinuously();
-    method public int getValue();
-    method public boolean isAdjustable();
-    method public void setAdjustable(boolean);
-    method public final void setMax(int);
-    method public void setMin(int);
-    method public final void setSeekBarIncrement(int);
-    method public void setShowSeekBarValue(boolean);
-    method public void setUpdatesContinuously(boolean);
-    method public void setValue(int);
-  }
-
-  public class SwitchPreference extends androidx.preference.TwoStatePreference {
-    ctor public SwitchPreference(android.content.Context);
-    ctor public SwitchPreference(android.content.Context, android.util.AttributeSet?);
-    ctor public SwitchPreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public SwitchPreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public CharSequence? getSwitchTextOff();
-    method public CharSequence? getSwitchTextOn();
-    method public void setSwitchTextOff(int);
-    method public void setSwitchTextOff(CharSequence?);
-    method public void setSwitchTextOn(int);
-    method public void setSwitchTextOn(CharSequence?);
-  }
-
-  public class SwitchPreferenceCompat extends androidx.preference.TwoStatePreference {
-    ctor public SwitchPreferenceCompat(android.content.Context);
-    ctor public SwitchPreferenceCompat(android.content.Context, android.util.AttributeSet?);
-    ctor public SwitchPreferenceCompat(android.content.Context, android.util.AttributeSet?, int);
-    ctor public SwitchPreferenceCompat(android.content.Context, android.util.AttributeSet?, int, int);
-    method public CharSequence? getSwitchTextOff();
-    method public CharSequence? getSwitchTextOn();
-    method public void setSwitchTextOff(int);
-    method public void setSwitchTextOff(CharSequence?);
-    method public void setSwitchTextOn(int);
-    method public void setSwitchTextOn(CharSequence?);
-  }
-
-  public abstract class TwoStatePreference extends androidx.preference.Preference {
-    ctor public TwoStatePreference(android.content.Context);
-    ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet?);
-    ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet?, int);
-    ctor public TwoStatePreference(android.content.Context, android.util.AttributeSet?, int, int);
-    method public boolean getDisableDependentsState();
-    method public CharSequence? getSummaryOff();
-    method public CharSequence? getSummaryOn();
-    method public boolean isChecked();
-    method public void setChecked(boolean);
-    method public void setDisableDependentsState(boolean);
-    method public void setSummaryOff(int);
-    method public void setSummaryOff(CharSequence?);
-    method public void setSummaryOn(int);
-    method public void setSummaryOn(CharSequence?);
-    method protected void syncSummaryView(androidx.preference.PreferenceViewHolder);
-    field protected boolean mChecked;
-  }
-
-}
-
diff --git a/print/print/api/public_plus_experimental_1.1.0-beta01.txt b/print/print/api/public_plus_experimental_1.1.0-beta01.txt
deleted file mode 100644
index a8f3fd9..0000000
--- a/print/print/api/public_plus_experimental_1.1.0-beta01.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Signature format: 4.0
-package androidx.print {
-
-  public final class PrintHelper {
-    ctor public PrintHelper(android.content.Context);
-    method public int getColorMode();
-    method public int getOrientation();
-    method public int getScaleMode();
-    method public void printBitmap(String, android.graphics.Bitmap);
-    method public void printBitmap(String, android.graphics.Bitmap, androidx.print.PrintHelper.OnPrintFinishCallback?);
-    method public void printBitmap(String, android.net.Uri) throws java.io.FileNotFoundException;
-    method public void printBitmap(String, android.net.Uri, androidx.print.PrintHelper.OnPrintFinishCallback?) throws java.io.FileNotFoundException;
-    method public void setColorMode(int);
-    method public void setOrientation(int);
-    method public void setScaleMode(int);
-    method public static boolean systemSupportsPrint();
-    field public static final int COLOR_MODE_COLOR = 2; // 0x2
-    field public static final int COLOR_MODE_MONOCHROME = 1; // 0x1
-    field public static final int ORIENTATION_LANDSCAPE = 1; // 0x1
-    field public static final int ORIENTATION_PORTRAIT = 2; // 0x2
-    field public static final int SCALE_MODE_FILL = 2; // 0x2
-    field public static final int SCALE_MODE_FIT = 1; // 0x1
-  }
-
-  public static interface PrintHelper.OnPrintFinishCallback {
-    method public void onFinish();
-  }
-
-}
-
diff --git a/print/print/api/public_plus_experimental_current.txt b/print/print/api/public_plus_experimental_current.txt
deleted file mode 100644
index a8f3fd9..0000000
--- a/print/print/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Signature format: 4.0
-package androidx.print {
-
-  public final class PrintHelper {
-    ctor public PrintHelper(android.content.Context);
-    method public int getColorMode();
-    method public int getOrientation();
-    method public int getScaleMode();
-    method public void printBitmap(String, android.graphics.Bitmap);
-    method public void printBitmap(String, android.graphics.Bitmap, androidx.print.PrintHelper.OnPrintFinishCallback?);
-    method public void printBitmap(String, android.net.Uri) throws java.io.FileNotFoundException;
-    method public void printBitmap(String, android.net.Uri, androidx.print.PrintHelper.OnPrintFinishCallback?) throws java.io.FileNotFoundException;
-    method public void setColorMode(int);
-    method public void setOrientation(int);
-    method public void setScaleMode(int);
-    method public static boolean systemSupportsPrint();
-    field public static final int COLOR_MODE_COLOR = 2; // 0x2
-    field public static final int COLOR_MODE_MONOCHROME = 1; // 0x1
-    field public static final int ORIENTATION_LANDSCAPE = 1; // 0x1
-    field public static final int ORIENTATION_PORTRAIT = 2; // 0x2
-    field public static final int SCALE_MODE_FILL = 2; // 0x2
-    field public static final int SCALE_MODE_FIT = 1; // 0x1
-  }
-
-  public static interface PrintHelper.OnPrintFinishCallback {
-    method public void onFinish();
-  }
-
-}
-
diff --git a/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_1.0.0-beta05.txt b/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_1.0.0-beta05.txt
deleted file mode 100644
index 26eea8b..0000000
--- a/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_1.0.0-beta05.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-// Signature format: 4.0
-package androidx.privacysandbox.ads.adservices.java.adid {
-
-  public abstract class AdIdManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_AD_ID) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.adid.AdId> getAdIdAsync();
-    field public static final androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures.Companion Companion;
-  }
-
-  public static final class AdIdManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.adselection {
-
-  public abstract class AdSelectionManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> reportImpressionAsync(androidx.privacysandbox.ads.adservices.adselection.ReportImpressionRequest reportImpressionRequest);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome> selectAdsAsync(androidx.privacysandbox.ads.adservices.adselection.AdSelectionConfig adSelectionConfig);
-    field public static final androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures.Companion Companion;
-  }
-
-  public static final class AdSelectionManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.appsetid {
-
-  public abstract class AppSetIdManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures? from(android.content.Context context);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.appsetid.AppSetId> getAppSetIdAsync();
-    field public static final androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures.Companion Companion;
-  }
-
-  public static final class AppSetIdManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.customaudience {
-
-  public abstract class CustomAudienceManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> joinCustomAudienceAsync(androidx.privacysandbox.ads.adservices.customaudience.JoinCustomAudienceRequest request);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> leaveCustomAudienceAsync(androidx.privacysandbox.ads.adservices.customaudience.LeaveCustomAudienceRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures.Companion Companion;
-  }
-
-  public static final class CustomAudienceManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.measurement {
-
-  public abstract class MeasurementManagerFutures {
-    method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> deleteRegistrationsAsync(androidx.privacysandbox.ads.adservices.measurement.DeletionRequest deletionRequest);
-    method public static final androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<java.lang.Integer> getMeasurementApiStatusAsync();
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerSourceAsync(android.net.Uri attributionSource, android.view.InputEvent? inputEvent);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerTriggerAsync(android.net.Uri trigger);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerWebSourceAsync(androidx.privacysandbox.ads.adservices.measurement.WebSourceRegistrationRequest request);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerWebTriggerAsync(androidx.privacysandbox.ads.adservices.measurement.WebTriggerRegistrationRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures.Companion Companion;
-  }
-
-  public static final class MeasurementManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.topics {
-
-  public abstract class TopicsManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_TOPICS) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.topics.GetTopicsResponse> getTopicsAsync(androidx.privacysandbox.ads.adservices.topics.GetTopicsRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures.Companion Companion;
-  }
-
-  public static final class TopicsManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures? from(android.content.Context context);
-  }
-
-}
-
diff --git a/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_current.txt b/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_current.txt
deleted file mode 100644
index 26eea8b..0000000
--- a/privacysandbox/ads/ads-adservices-java/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-// Signature format: 4.0
-package androidx.privacysandbox.ads.adservices.java.adid {
-
-  public abstract class AdIdManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_AD_ID) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.adid.AdId> getAdIdAsync();
-    field public static final androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures.Companion Companion;
-  }
-
-  public static final class AdIdManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.adid.AdIdManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.adselection {
-
-  public abstract class AdSelectionManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> reportImpressionAsync(androidx.privacysandbox.ads.adservices.adselection.ReportImpressionRequest reportImpressionRequest);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome> selectAdsAsync(androidx.privacysandbox.ads.adservices.adselection.AdSelectionConfig adSelectionConfig);
-    field public static final androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures.Companion Companion;
-  }
-
-  public static final class AdSelectionManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.adselection.AdSelectionManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.appsetid {
-
-  public abstract class AppSetIdManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures? from(android.content.Context context);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.appsetid.AppSetId> getAppSetIdAsync();
-    field public static final androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures.Companion Companion;
-  }
-
-  public static final class AppSetIdManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.appsetid.AppSetIdManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.customaudience {
-
-  public abstract class CustomAudienceManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> joinCustomAudienceAsync(androidx.privacysandbox.ads.adservices.customaudience.JoinCustomAudienceRequest request);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> leaveCustomAudienceAsync(androidx.privacysandbox.ads.adservices.customaudience.LeaveCustomAudienceRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures.Companion Companion;
-  }
-
-  public static final class CustomAudienceManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.customaudience.CustomAudienceManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.measurement {
-
-  public abstract class MeasurementManagerFutures {
-    method public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> deleteRegistrationsAsync(androidx.privacysandbox.ads.adservices.measurement.DeletionRequest deletionRequest);
-    method public static final androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<java.lang.Integer> getMeasurementApiStatusAsync();
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerSourceAsync(android.net.Uri attributionSource, android.view.InputEvent? inputEvent);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerTriggerAsync(android.net.Uri trigger);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerWebSourceAsync(androidx.privacysandbox.ads.adservices.measurement.WebSourceRegistrationRequest request);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public abstract com.google.common.util.concurrent.ListenableFuture<kotlin.Unit> registerWebTriggerAsync(androidx.privacysandbox.ads.adservices.measurement.WebTriggerRegistrationRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures.Companion Companion;
-  }
-
-  public static final class MeasurementManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.measurement.MeasurementManagerFutures? from(android.content.Context context);
-  }
-
-}
-
-package androidx.privacysandbox.ads.adservices.java.topics {
-
-  public abstract class TopicsManagerFutures {
-    method public static final androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures? from(android.content.Context context);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_TOPICS) public abstract com.google.common.util.concurrent.ListenableFuture<androidx.privacysandbox.ads.adservices.topics.GetTopicsResponse> getTopicsAsync(androidx.privacysandbox.ads.adservices.topics.GetTopicsRequest request);
-    field public static final androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures.Companion Companion;
-  }
-
-  public static final class TopicsManagerFutures.Companion {
-    method public androidx.privacysandbox.ads.adservices.java.topics.TopicsManagerFutures? from(android.content.Context context);
-  }
-
-}
-
diff --git a/privacysandbox/tools/tools/api/public_plus_experimental_current.txt b/privacysandbox/tools/tools/api/public_plus_experimental_current.txt
deleted file mode 100644
index 7b7f6e8..0000000
--- a/privacysandbox/tools/tools/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Signature format: 4.0
-package androidx.privacysandbox.tools {
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface PrivacySandboxCallback {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface PrivacySandboxInterface {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface PrivacySandboxService {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface PrivacySandboxValue {
-  }
-
-}
-
diff --git a/profileinstaller/profileinstaller/api/public_plus_experimental_current.txt b/profileinstaller/profileinstaller/api/public_plus_experimental_current.txt
deleted file mode 100644
index e7da088..0000000
--- a/profileinstaller/profileinstaller/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-// Signature format: 4.0
-package androidx.profileinstaller {
-
-  public class ProfileInstallReceiver extends android.content.BroadcastReceiver {
-    ctor public ProfileInstallReceiver();
-    method public void onReceive(android.content.Context, android.content.Intent?);
-    field public static final String ACTION_BENCHMARK_OPERATION = "androidx.profileinstaller.action.BENCHMARK_OPERATION";
-    field public static final String ACTION_INSTALL_PROFILE = "androidx.profileinstaller.action.INSTALL_PROFILE";
-    field public static final String ACTION_SAVE_PROFILE = "androidx.profileinstaller.action.SAVE_PROFILE";
-    field public static final String ACTION_SKIP_FILE = "androidx.profileinstaller.action.SKIP_FILE";
-  }
-
-  public class ProfileInstaller {
-    method @WorkerThread public static void writeProfile(android.content.Context);
-    method @WorkerThread public static void writeProfile(android.content.Context, java.util.concurrent.Executor, androidx.profileinstaller.ProfileInstaller.DiagnosticsCallback);
-    field public static final int DIAGNOSTIC_CURRENT_PROFILE_DOES_NOT_EXIST = 2; // 0x2
-    field public static final int DIAGNOSTIC_CURRENT_PROFILE_EXISTS = 1; // 0x1
-    field public static final int DIAGNOSTIC_PROFILE_IS_COMPRESSED = 5; // 0x5
-    field public static final int DIAGNOSTIC_REF_PROFILE_DOES_NOT_EXIST = 4; // 0x4
-    field public static final int DIAGNOSTIC_REF_PROFILE_EXISTS = 3; // 0x3
-    field public static final int RESULT_ALREADY_INSTALLED = 2; // 0x2
-    field public static final int RESULT_BASELINE_PROFILE_NOT_FOUND = 6; // 0x6
-    field public static final int RESULT_BENCHMARK_OPERATION_FAILURE = 15; // 0xf
-    field public static final int RESULT_BENCHMARK_OPERATION_SUCCESS = 14; // 0xe
-    field public static final int RESULT_BENCHMARK_OPERATION_UNKNOWN = 16; // 0x10
-    field public static final int RESULT_DELETE_SKIP_FILE_SUCCESS = 11; // 0xb
-    field public static final int RESULT_DESIRED_FORMAT_UNSUPPORTED = 5; // 0x5
-    field public static final int RESULT_INSTALL_SKIP_FILE_SUCCESS = 10; // 0xa
-    field public static final int RESULT_INSTALL_SUCCESS = 1; // 0x1
-    field public static final int RESULT_IO_EXCEPTION = 7; // 0x7
-    field public static final int RESULT_META_FILE_REQUIRED_BUT_NOT_FOUND = 9; // 0x9
-    field public static final int RESULT_NOT_WRITABLE = 4; // 0x4
-    field public static final int RESULT_PARSE_EXCEPTION = 8; // 0x8
-    field public static final int RESULT_SAVE_PROFILE_SIGNALLED = 12; // 0xc
-    field public static final int RESULT_SAVE_PROFILE_SKIPPED = 13; // 0xd
-    field public static final int RESULT_UNSUPPORTED_ART_VERSION = 3; // 0x3
-  }
-
-  public static interface ProfileInstaller.DiagnosticsCallback {
-    method public void onDiagnosticReceived(int, Object?);
-    method public void onResultReceived(int, Object?);
-  }
-
-  public class ProfileInstallerInitializer implements androidx.startup.Initializer<androidx.profileinstaller.ProfileInstallerInitializer.Result> {
-    ctor public ProfileInstallerInitializer();
-    method public androidx.profileinstaller.ProfileInstallerInitializer.Result create(android.content.Context);
-    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
-  }
-
-  public static class ProfileInstallerInitializer.Result {
-    ctor public ProfileInstallerInitializer.Result();
-  }
-
-  public final class ProfileVerifier {
-    method public static com.google.common.util.concurrent.ListenableFuture<androidx.profileinstaller.ProfileVerifier.CompilationStatus!> getCompilationStatusAsync();
-    method @WorkerThread public static androidx.profileinstaller.ProfileVerifier.CompilationStatus writeProfileVerification(android.content.Context);
-  }
-
-  public static class ProfileVerifier.CompilationStatus {
-    method public int getProfileInstallResultCode();
-    method public boolean hasProfileEnqueuedForCompilation();
-    method public boolean isCompiledWithProfile();
-    field public static final int RESULT_CODE_COMPILED_WITH_PROFILE = 1; // 0x1
-    field public static final int RESULT_CODE_COMPILED_WITH_PROFILE_NON_MATCHING = 3; // 0x3
-    field public static final int RESULT_CODE_ERROR_CACHE_FILE_EXISTS_BUT_CANNOT_BE_READ = 131072; // 0x20000
-    field public static final int RESULT_CODE_ERROR_CANT_WRITE_PROFILE_VERIFICATION_RESULT_CACHE_FILE = 196608; // 0x30000
-    field public static final int RESULT_CODE_ERROR_PACKAGE_NAME_DOES_NOT_EXIST = 65536; // 0x10000
-    field public static final int RESULT_CODE_ERROR_UNSUPPORTED_API_VERSION = 262144; // 0x40000
-    field public static final int RESULT_CODE_NO_PROFILE = 0; // 0x0
-    field public static final int RESULT_CODE_PROFILE_ENQUEUED_FOR_COMPILATION = 2; // 0x2
-  }
-
-}
-
diff --git a/recommendation/recommendation/api/public_plus_experimental_current.txt b/recommendation/recommendation/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9731349..0000000
--- a/recommendation/recommendation/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-// Signature format: 4.0
-package androidx.recommendation.app {
-
-  public final class ContentRecommendation {
-    method public String? getBackgroundImageUri();
-    method public int getBadgeImageResourceId();
-    method public int getColor();
-    method public android.graphics.Bitmap? getContentImage();
-    method public androidx.recommendation.app.ContentRecommendation.IntentData? getContentIntent();
-    method public String![]? getContentTypes();
-    method public androidx.recommendation.app.ContentRecommendation.IntentData? getDismissIntent();
-    method public String![]? getGenres();
-    method public String? getGroup();
-    method public String? getIdTag();
-    method public String? getMaturityRating();
-    method public android.app.Notification getNotificationObject(android.content.Context);
-    method public String? getPricingType();
-    method public String? getPricingValue();
-    method public String? getPrimaryContentType();
-    method public int getProgressMax();
-    method public int getProgressValue();
-    method public long getRunningTime();
-    method public String? getSortKey();
-    method public String? getSourceName();
-    method public int getStatus();
-    method public String? getText();
-    method public String? getTitle();
-    method public boolean hasProgressInfo();
-    method public boolean isAutoDismiss();
-    method public void setAutoDismiss(boolean);
-    method public void setGroup(String?);
-    method public void setProgress(int, int);
-    method public void setSortKey(String?);
-    method public void setStatus(@androidx.recommendation.app.ContentRecommendation.ContentStatus int);
-    field public static final String CONTENT_MATURITY_ALL = "android.contentMaturity.all";
-    field public static final String CONTENT_MATURITY_HIGH = "android.contentMaturity.high";
-    field public static final String CONTENT_MATURITY_LOW = "android.contentMaturity.low";
-    field public static final String CONTENT_MATURITY_MEDIUM = "android.contentMaturity.medium";
-    field public static final String CONTENT_PRICING_FREE = "android.contentPrice.free";
-    field public static final String CONTENT_PRICING_PREORDER = "android.contentPrice.preorder";
-    field public static final String CONTENT_PRICING_PURCHASE = "android.contentPrice.purchase";
-    field public static final String CONTENT_PRICING_RENTAL = "android.contentPrice.rental";
-    field public static final String CONTENT_PRICING_SUBSCRIPTION = "android.contentPrice.subscription";
-    field public static final int CONTENT_STATUS_AVAILABLE = 2; // 0x2
-    field public static final int CONTENT_STATUS_PENDING = 1; // 0x1
-    field public static final int CONTENT_STATUS_READY = 0; // 0x0
-    field public static final int CONTENT_STATUS_UNAVAILABLE = 3; // 0x3
-    field public static final String CONTENT_TYPE_APP = "android.contentType.app";
-    field public static final String CONTENT_TYPE_BOOK = "android.contentType.book";
-    field public static final String CONTENT_TYPE_COMIC = "android.contentType.comic";
-    field public static final String CONTENT_TYPE_GAME = "android.contentType.game";
-    field public static final String CONTENT_TYPE_MAGAZINE = "android.contentType.magazine";
-    field public static final String CONTENT_TYPE_MOVIE = "android.contentType.movie";
-    field public static final String CONTENT_TYPE_MUSIC = "android.contentType.music";
-    field public static final String CONTENT_TYPE_NEWS = "android.contentType.news";
-    field public static final String CONTENT_TYPE_PODCAST = "android.contentType.podcast";
-    field public static final String CONTENT_TYPE_RADIO = "android.contentType.radio";
-    field public static final String CONTENT_TYPE_SERIAL = "android.contentType.serial";
-    field public static final String CONTENT_TYPE_SPORTS = "android.contentType.sports";
-    field public static final String CONTENT_TYPE_TRAILER = "android.contentType.trailer";
-    field public static final String CONTENT_TYPE_VIDEO = "android.contentType.video";
-    field public static final String CONTENT_TYPE_WEBSITE = "android.contentType.website";
-    field public static final int INTENT_TYPE_ACTIVITY = 1; // 0x1
-    field public static final int INTENT_TYPE_BROADCAST = 2; // 0x2
-    field public static final int INTENT_TYPE_SERVICE = 3; // 0x3
-  }
-
-  public static final class ContentRecommendation.Builder {
-    ctor public ContentRecommendation.Builder();
-    method public androidx.recommendation.app.ContentRecommendation build();
-    method public androidx.recommendation.app.ContentRecommendation.Builder setAutoDismiss(boolean);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setBackgroundImageUri(String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setBadgeIcon(@DrawableRes int);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setColor(@ColorInt int);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setContentImage(android.graphics.Bitmap);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setContentIntentData(@androidx.recommendation.app.ContentRecommendation.IntentType int, android.content.Intent, int, android.os.Bundle?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setContentTypes(String![]);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setDismissIntentData(@androidx.recommendation.app.ContentRecommendation.IntentType int, android.content.Intent?, int, android.os.Bundle?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setGenres(String![]?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setGroup(String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setIdTag(String);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setMaturityRating(@androidx.recommendation.app.ContentRecommendation.ContentMaturity String);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setPricingInformation(@androidx.recommendation.app.ContentRecommendation.ContentPricing String, String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setProgress(int, int);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setRunningTime(long);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setSortKey(String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setSourceName(String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setStatus(@androidx.recommendation.app.ContentRecommendation.ContentStatus int);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setText(String?);
-    method public androidx.recommendation.app.ContentRecommendation.Builder setTitle(String);
-  }
-
-  @StringDef({androidx.recommendation.app.ContentRecommendation.CONTENT_MATURITY_ALL, androidx.recommendation.app.ContentRecommendation.CONTENT_MATURITY_LOW, androidx.recommendation.app.ContentRecommendation.CONTENT_MATURITY_MEDIUM, androidx.recommendation.app.ContentRecommendation.CONTENT_MATURITY_HIGH}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ContentRecommendation.ContentMaturity {
-  }
-
-  @StringDef({androidx.recommendation.app.ContentRecommendation.CONTENT_PRICING_FREE, androidx.recommendation.app.ContentRecommendation.CONTENT_PRICING_RENTAL, androidx.recommendation.app.ContentRecommendation.CONTENT_PRICING_PURCHASE, androidx.recommendation.app.ContentRecommendation.CONTENT_PRICING_PREORDER, androidx.recommendation.app.ContentRecommendation.CONTENT_PRICING_SUBSCRIPTION}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ContentRecommendation.ContentPricing {
-  }
-
-  @IntDef({androidx.recommendation.app.ContentRecommendation.CONTENT_STATUS_READY, androidx.recommendation.app.ContentRecommendation.CONTENT_STATUS_PENDING, androidx.recommendation.app.ContentRecommendation.CONTENT_STATUS_AVAILABLE, androidx.recommendation.app.ContentRecommendation.CONTENT_STATUS_UNAVAILABLE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ContentRecommendation.ContentStatus {
-  }
-
-  @StringDef({androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_VIDEO, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_MOVIE, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_TRAILER, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_SERIAL, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_MUSIC, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_RADIO, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_PODCAST, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_NEWS, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_SPORTS, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_APP, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_GAME, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_BOOK, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_COMIC, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_MAGAZINE, androidx.recommendation.app.ContentRecommendation.CONTENT_TYPE_WEBSITE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ContentRecommendation.ContentType {
-  }
-
-  public static class ContentRecommendation.IntentData {
-    ctor public ContentRecommendation.IntentData();
-  }
-
-  @IntDef({androidx.recommendation.app.ContentRecommendation.INTENT_TYPE_ACTIVITY, androidx.recommendation.app.ContentRecommendation.INTENT_TYPE_BROADCAST, androidx.recommendation.app.ContentRecommendation.INTENT_TYPE_SERVICE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ContentRecommendation.IntentType {
-  }
-
-  public final class RecommendationExtender implements android.app.Notification.Extender {
-    ctor public RecommendationExtender();
-    ctor public RecommendationExtender(android.app.Notification);
-    method public android.app.Notification.Builder! extend(android.app.Notification.Builder!);
-    method public String![]? getContentTypes();
-    method public String![]? getGenres();
-    method public String? getMaturityRating();
-    method public String? getPricingType();
-    method public String? getPricingValue();
-    method public String? getPrimaryContentType();
-    method public long getRunningTime();
-    method public int getStatus();
-    method public androidx.recommendation.app.RecommendationExtender setContentTypes(String![]?);
-    method public androidx.recommendation.app.RecommendationExtender setGenres(String![]?);
-    method public androidx.recommendation.app.RecommendationExtender setMaturityRating(@androidx.recommendation.app.ContentRecommendation.ContentMaturity String?);
-    method public androidx.recommendation.app.RecommendationExtender setPricingInformation(@androidx.recommendation.app.ContentRecommendation.ContentPricing String?, String?);
-    method public androidx.recommendation.app.RecommendationExtender setRunningTime(long);
-    method public androidx.recommendation.app.RecommendationExtender setStatus(@androidx.recommendation.app.ContentRecommendation.ContentStatus int);
-  }
-
-}
-
diff --git a/recyclerview/recyclerview-selection/api/public_plus_experimental_current.txt b/recyclerview/recyclerview-selection/api/public_plus_experimental_current.txt
deleted file mode 100644
index 81ea8cd..0000000
--- a/recyclerview/recyclerview-selection/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-// Signature format: 4.0
-package androidx.recyclerview.selection {
-
-  public abstract class BandPredicate {
-    ctor public BandPredicate();
-    method public abstract boolean canInitiate(android.view.MotionEvent);
-  }
-
-  public static final class BandPredicate.EmptyArea extends androidx.recyclerview.selection.BandPredicate {
-    ctor public BandPredicate.EmptyArea(androidx.recyclerview.widget.RecyclerView);
-    method public boolean canInitiate(android.view.MotionEvent);
-  }
-
-  public static final class BandPredicate.NonDraggableArea extends androidx.recyclerview.selection.BandPredicate {
-    ctor public BandPredicate.NonDraggableArea(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemDetailsLookup<?>);
-    method public boolean canInitiate(android.view.MotionEvent);
-  }
-
-  public abstract class FocusDelegate<K> {
-    ctor public FocusDelegate();
-    method public abstract void clearFocus();
-    method public abstract void focusItem(androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails<K!>);
-    method public abstract int getFocusedPosition();
-    method public abstract boolean hasFocusedItem();
-  }
-
-  public abstract class ItemDetailsLookup<K> {
-    ctor public ItemDetailsLookup();
-    method public abstract androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails<K!>? getItemDetails(android.view.MotionEvent);
-  }
-
-  public abstract static class ItemDetailsLookup.ItemDetails<K> {
-    ctor public ItemDetailsLookup.ItemDetails();
-    method public abstract int getPosition();
-    method public abstract K? getSelectionKey();
-    method public boolean hasSelectionKey();
-    method public boolean inDragRegion(android.view.MotionEvent);
-    method public boolean inSelectionHotspot(android.view.MotionEvent);
-  }
-
-  public abstract class ItemKeyProvider<K> {
-    ctor protected ItemKeyProvider(@androidx.recyclerview.selection.ItemKeyProvider.Scope int);
-    method public abstract K? getKey(int);
-    method public abstract int getPosition(K);
-    field public static final int SCOPE_CACHED = 1; // 0x1
-    field public static final int SCOPE_MAPPED = 0; // 0x0
-  }
-
-  @IntDef({androidx.recyclerview.selection.ItemKeyProvider.SCOPE_MAPPED, androidx.recyclerview.selection.ItemKeyProvider.SCOPE_CACHED}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ItemKeyProvider.Scope {
-  }
-
-  public final class MutableSelection<K> extends androidx.recyclerview.selection.Selection<K> {
-    ctor public MutableSelection();
-    method public boolean add(K);
-    method public void clear();
-    method public void copyFrom(androidx.recyclerview.selection.Selection<K!>);
-    method public boolean remove(K);
-  }
-
-  public interface OnContextClickListener {
-    method public boolean onContextClick(android.view.MotionEvent);
-  }
-
-  public interface OnDragInitiatedListener {
-    method public boolean onDragInitiated(android.view.MotionEvent);
-  }
-
-  public interface OnItemActivatedListener<K> {
-    method public boolean onItemActivated(androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails<K!>, android.view.MotionEvent);
-  }
-
-  public final class OperationMonitor {
-    ctor public OperationMonitor();
-    method public void addListener(androidx.recyclerview.selection.OperationMonitor.OnChangeListener);
-    method public boolean isStarted();
-    method public void removeListener(androidx.recyclerview.selection.OperationMonitor.OnChangeListener);
-  }
-
-  public static interface OperationMonitor.OnChangeListener {
-    method public void onChanged();
-  }
-
-  public class Selection<K> implements java.lang.Iterable<K> {
-    method public boolean contains(K?);
-    method public boolean isEmpty();
-    method public java.util.Iterator<K!> iterator();
-    method public int size();
-  }
-
-  public final class SelectionPredicates {
-    method public static <K> androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K!> createSelectAnything();
-    method public static <K> androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K!> createSelectSingleAnything();
-  }
-
-  public abstract class SelectionTracker<K> {
-    ctor public SelectionTracker();
-    method public abstract void addObserver(androidx.recyclerview.selection.SelectionTracker.SelectionObserver<K!>);
-    method public abstract boolean clearSelection();
-    method public abstract void copySelection(androidx.recyclerview.selection.MutableSelection<K!>);
-    method public abstract boolean deselect(K);
-    method public abstract androidx.recyclerview.selection.Selection<K!> getSelection();
-    method public abstract boolean hasSelection();
-    method public abstract boolean isSelected(K?);
-    method public abstract void onRestoreInstanceState(android.os.Bundle?);
-    method public abstract void onSaveInstanceState(android.os.Bundle);
-    method protected abstract void restoreSelection(androidx.recyclerview.selection.Selection<K!>);
-    method public abstract boolean select(K);
-    method public abstract boolean setItemsSelected(Iterable<K!>, boolean);
-    field public static final String SELECTION_CHANGED_MARKER = "Selection-Changed";
-  }
-
-  public static final class SelectionTracker.Builder<K> {
-    ctor public SelectionTracker.Builder(String, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.selection.ItemKeyProvider<K!>, androidx.recyclerview.selection.ItemDetailsLookup<K!>, androidx.recyclerview.selection.StorageStrategy<K!>);
-    method public androidx.recyclerview.selection.SelectionTracker<K!> build();
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withBandOverlay(@DrawableRes int);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withBandPredicate(androidx.recyclerview.selection.BandPredicate);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withFocusDelegate(androidx.recyclerview.selection.FocusDelegate<K!>);
-    method @Deprecated public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withGestureTooltypes(int...);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withOnContextClickListener(androidx.recyclerview.selection.OnContextClickListener);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withOnDragInitiatedListener(androidx.recyclerview.selection.OnDragInitiatedListener);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withOnItemActivatedListener(androidx.recyclerview.selection.OnItemActivatedListener<K!>);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withOperationMonitor(androidx.recyclerview.selection.OperationMonitor);
-    method @Deprecated public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withPointerTooltypes(int...);
-    method public androidx.recyclerview.selection.SelectionTracker.Builder<K!> withSelectionPredicate(androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K!>);
-  }
-
-  public abstract static class SelectionTracker.SelectionObserver<K> {
-    ctor public SelectionTracker.SelectionObserver();
-    method public void onItemStateChanged(K, boolean);
-    method public void onSelectionChanged();
-    method public void onSelectionRefresh();
-    method public void onSelectionRestored();
-  }
-
-  public abstract static class SelectionTracker.SelectionPredicate<K> {
-    ctor public SelectionTracker.SelectionPredicate();
-    method public abstract boolean canSelectMultiple();
-    method public abstract boolean canSetStateAtPosition(int, boolean);
-    method public abstract boolean canSetStateForKey(K, boolean);
-  }
-
-  public final class StableIdKeyProvider extends androidx.recyclerview.selection.ItemKeyProvider<java.lang.Long> {
-    ctor public StableIdKeyProvider(androidx.recyclerview.widget.RecyclerView);
-    method public Long? getKey(int);
-    method public int getPosition(Long);
-  }
-
-  public abstract class StorageStrategy<K> {
-    ctor public StorageStrategy(Class<K!>);
-    method public abstract android.os.Bundle asBundle(androidx.recyclerview.selection.Selection<K!>);
-    method public abstract androidx.recyclerview.selection.Selection<K!>? asSelection(android.os.Bundle);
-    method public static androidx.recyclerview.selection.StorageStrategy<java.lang.Long!> createLongStorage();
-    method public static <K extends android.os.Parcelable> androidx.recyclerview.selection.StorageStrategy<K!> createParcelableStorage(Class<K!>);
-    method public static androidx.recyclerview.selection.StorageStrategy<java.lang.String!> createStringStorage();
-  }
-
-}
-
diff --git a/recyclerview/recyclerview/api/public_plus_experimental_current.txt b/recyclerview/recyclerview/api/public_plus_experimental_current.txt
deleted file mode 100644
index 0e9b27d..0000000
--- a/recyclerview/recyclerview/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,1094 +0,0 @@
-// Signature format: 4.0
-package androidx.recyclerview.widget {
-
-  public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
-    ctor public AdapterListUpdateCallback(androidx.recyclerview.widget.RecyclerView.Adapter);
-    method public void onChanged(int, int, Object!);
-    method public void onInserted(int, int);
-    method public void onMoved(int, int);
-    method public void onRemoved(int, int);
-  }
-
-  public final class AsyncDifferConfig<T> {
-    method public java.util.concurrent.Executor getBackgroundThreadExecutor();
-    method public androidx.recyclerview.widget.DiffUtil.ItemCallback<T!> getDiffCallback();
-  }
-
-  public static final class AsyncDifferConfig.Builder<T> {
-    ctor public AsyncDifferConfig.Builder(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
-    method public androidx.recyclerview.widget.AsyncDifferConfig<T!> build();
-    method public androidx.recyclerview.widget.AsyncDifferConfig.Builder<T!> setBackgroundThreadExecutor(java.util.concurrent.Executor?);
-  }
-
-  public class AsyncListDiffer<T> {
-    ctor public AsyncListDiffer(androidx.recyclerview.widget.ListUpdateCallback, androidx.recyclerview.widget.AsyncDifferConfig<T!>);
-    ctor public AsyncListDiffer(androidx.recyclerview.widget.RecyclerView.Adapter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
-    method public void addListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
-    method public java.util.List<T!> getCurrentList();
-    method public void removeListListener(androidx.recyclerview.widget.AsyncListDiffer.ListListener<T!>);
-    method public void submitList(java.util.List<T!>?);
-    method public void submitList(java.util.List<T!>?, Runnable?);
-  }
-
-  public static interface AsyncListDiffer.ListListener<T> {
-    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
-  }
-
-  public class AsyncListUtil<T> {
-    ctor public AsyncListUtil(Class<T!>, int, androidx.recyclerview.widget.AsyncListUtil.DataCallback<T!>, androidx.recyclerview.widget.AsyncListUtil.ViewCallback);
-    method public T? getItem(int);
-    method public int getItemCount();
-    method public void onRangeChanged();
-    method public void refresh();
-  }
-
-  public abstract static class AsyncListUtil.DataCallback<T> {
-    ctor public AsyncListUtil.DataCallback();
-    method @WorkerThread public abstract void fillData(T![], int, int);
-    method @WorkerThread public int getMaxCachedTiles();
-    method @WorkerThread public void recycleData(T![], int);
-    method @WorkerThread public abstract int refreshData();
-  }
-
-  public abstract static class AsyncListUtil.ViewCallback {
-    ctor public AsyncListUtil.ViewCallback();
-    method @UiThread public void extendRangeInto(int[], int[], int);
-    method @UiThread public abstract void getItemRangeInto(int[]);
-    method @UiThread public abstract void onDataRefresh();
-    method @UiThread public abstract void onItemLoaded(int);
-    field public static final int HINT_SCROLL_ASC = 2; // 0x2
-    field public static final int HINT_SCROLL_DESC = 1; // 0x1
-    field public static final int HINT_SCROLL_NONE = 0; // 0x0
-  }
-
-  public class BatchingListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
-    ctor public BatchingListUpdateCallback(androidx.recyclerview.widget.ListUpdateCallback);
-    method public void dispatchLastEvent();
-    method public void onChanged(int, int, Object!);
-    method public void onInserted(int, int);
-    method public void onMoved(int, int);
-    method public void onRemoved(int, int);
-  }
-
-  public final class ConcatAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder> {
-    ctor @java.lang.SafeVarargs public ConcatAdapter(androidx.recyclerview.widget.ConcatAdapter.Config, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
-    ctor public ConcatAdapter(androidx.recyclerview.widget.ConcatAdapter.Config, java.util.List<? extends androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>>);
-    ctor @java.lang.SafeVarargs public ConcatAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!...);
-    ctor public ConcatAdapter(java.util.List<? extends androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>>);
-    method public boolean addAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
-    method public boolean addAdapter(int, androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
-    method public java.util.List<? extends androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>> getAdapters();
-    method public int getItemCount();
-    method public android.util.Pair<androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>!,java.lang.Integer!> getWrappedAdapterAndPosition(int);
-    method public void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder onCreateViewHolder(android.view.ViewGroup, int);
-    method public boolean onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public boolean removeAdapter(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>);
-  }
-
-  public static final class ConcatAdapter.Config {
-    field public static final androidx.recyclerview.widget.ConcatAdapter.Config DEFAULT;
-    field public final boolean isolateViewTypes;
-    field public final androidx.recyclerview.widget.ConcatAdapter.Config.StableIdMode stableIdMode;
-  }
-
-  public static final class ConcatAdapter.Config.Builder {
-    ctor public ConcatAdapter.Config.Builder();
-    method public androidx.recyclerview.widget.ConcatAdapter.Config build();
-    method public androidx.recyclerview.widget.ConcatAdapter.Config.Builder setIsolateViewTypes(boolean);
-    method public androidx.recyclerview.widget.ConcatAdapter.Config.Builder setStableIdMode(androidx.recyclerview.widget.ConcatAdapter.Config.StableIdMode);
-  }
-
-  public enum ConcatAdapter.Config.StableIdMode {
-    enum_constant public static final androidx.recyclerview.widget.ConcatAdapter.Config.StableIdMode ISOLATED_STABLE_IDS;
-    enum_constant public static final androidx.recyclerview.widget.ConcatAdapter.Config.StableIdMode NO_STABLE_IDS;
-    enum_constant public static final androidx.recyclerview.widget.ConcatAdapter.Config.StableIdMode SHARED_STABLE_IDS;
-  }
-
-  public class DefaultItemAnimator extends androidx.recyclerview.widget.SimpleItemAnimator {
-    ctor public DefaultItemAnimator();
-    method public boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
-    method public boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
-    method public boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void endAnimations();
-    method public boolean isRunning();
-    method public void runPendingAnimations();
-  }
-
-  public class DiffUtil {
-    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback);
-    method public static androidx.recyclerview.widget.DiffUtil.DiffResult calculateDiff(androidx.recyclerview.widget.DiffUtil.Callback, boolean);
-  }
-
-  public abstract static class DiffUtil.Callback {
-    ctor public DiffUtil.Callback();
-    method public abstract boolean areContentsTheSame(int, int);
-    method public abstract boolean areItemsTheSame(int, int);
-    method public Object? getChangePayload(int, int);
-    method public abstract int getNewListSize();
-    method public abstract int getOldListSize();
-  }
-
-  public static class DiffUtil.DiffResult {
-    method public int convertNewPositionToOld(@IntRange(from=0) int);
-    method public int convertOldPositionToNew(@IntRange(from=0) int);
-    method public void dispatchUpdatesTo(androidx.recyclerview.widget.ListUpdateCallback);
-    method public void dispatchUpdatesTo(androidx.recyclerview.widget.RecyclerView.Adapter);
-    field public static final int NO_POSITION = -1; // 0xffffffff
-  }
-
-  public abstract static class DiffUtil.ItemCallback<T> {
-    ctor public DiffUtil.ItemCallback();
-    method public abstract boolean areContentsTheSame(T, T);
-    method public abstract boolean areItemsTheSame(T, T);
-    method public Object? getChangePayload(T, T);
-  }
-
-  public class DividerItemDecoration extends androidx.recyclerview.widget.RecyclerView.ItemDecoration {
-    ctor public DividerItemDecoration(android.content.Context!, int);
-    method public android.graphics.drawable.Drawable? getDrawable();
-    method public void setDrawable(android.graphics.drawable.Drawable);
-    method public void setOrientation(int);
-    field public static final int HORIZONTAL = 0; // 0x0
-    field public static final int VERTICAL = 1; // 0x1
-  }
-
-  public class GridLayoutManager extends androidx.recyclerview.widget.LinearLayoutManager {
-    ctor public GridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
-    ctor public GridLayoutManager(android.content.Context!, int);
-    ctor public GridLayoutManager(android.content.Context!, int, int, boolean);
-    method public int getSpanCount();
-    method public androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup! getSpanSizeLookup();
-    method public boolean isUsingSpansToEstimateScrollbarDimensions();
-    method public void setSpanCount(int);
-    method public void setSpanSizeLookup(androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup!);
-    method public void setUsingSpansToEstimateScrollbarDimensions(boolean);
-    field public static final int DEFAULT_SPAN_COUNT = -1; // 0xffffffff
-  }
-
-  public static final class GridLayoutManager.DefaultSpanSizeLookup extends androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup {
-    ctor public GridLayoutManager.DefaultSpanSizeLookup();
-    method public int getSpanSize(int);
-  }
-
-  public static class GridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
-    ctor public GridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor public GridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    ctor public GridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
-    ctor public GridLayoutManager.LayoutParams(int, int);
-    method public int getSpanIndex();
-    method public int getSpanSize();
-    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
-  }
-
-  public abstract static class GridLayoutManager.SpanSizeLookup {
-    ctor public GridLayoutManager.SpanSizeLookup();
-    method public int getSpanGroupIndex(int, int);
-    method public int getSpanIndex(int, int);
-    method public abstract int getSpanSize(int);
-    method public void invalidateSpanGroupIndexCache();
-    method public void invalidateSpanIndexCache();
-    method public boolean isSpanGroupIndexCacheEnabled();
-    method public boolean isSpanIndexCacheEnabled();
-    method public void setSpanGroupIndexCacheEnabled(boolean);
-    method public void setSpanIndexCacheEnabled(boolean);
-  }
-
-  public class ItemTouchHelper extends androidx.recyclerview.widget.RecyclerView.ItemDecoration implements androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener {
-    ctor public ItemTouchHelper(androidx.recyclerview.widget.ItemTouchHelper.Callback);
-    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?);
-    method public void onChildViewAttachedToWindow(android.view.View);
-    method public void onChildViewDetachedFromWindow(android.view.View);
-    method public void startDrag(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void startSwipe(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    field public static final int ACTION_STATE_DRAG = 2; // 0x2
-    field public static final int ACTION_STATE_IDLE = 0; // 0x0
-    field public static final int ACTION_STATE_SWIPE = 1; // 0x1
-    field public static final int ANIMATION_TYPE_DRAG = 8; // 0x8
-    field public static final int ANIMATION_TYPE_SWIPE_CANCEL = 4; // 0x4
-    field public static final int ANIMATION_TYPE_SWIPE_SUCCESS = 2; // 0x2
-    field public static final int DOWN = 2; // 0x2
-    field public static final int END = 32; // 0x20
-    field public static final int LEFT = 4; // 0x4
-    field public static final int RIGHT = 8; // 0x8
-    field public static final int START = 16; // 0x10
-    field public static final int UP = 1; // 0x1
-  }
-
-  public abstract static class ItemTouchHelper.Callback {
-    ctor public ItemTouchHelper.Callback();
-    method public boolean canDropOver(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! chooseDropTarget(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!>, int, int);
-    method public void clearView(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public int convertToAbsoluteDirection(int, int);
-    method public static int convertToRelativeDirection(int, int);
-    method public long getAnimationDuration(androidx.recyclerview.widget.RecyclerView, int, float, float);
-    method public int getBoundingBoxMargin();
-    method public static androidx.recyclerview.widget.ItemTouchUIUtil getDefaultUIUtil();
-    method public float getMoveThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public abstract int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public float getSwipeEscapeVelocity(float);
-    method public float getSwipeThreshold(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public float getSwipeVelocityThreshold(float);
-    method public int interpolateOutOfBoundsScroll(androidx.recyclerview.widget.RecyclerView, int, int, int, long);
-    method public boolean isItemViewSwipeEnabled();
-    method public boolean isLongPressDragEnabled();
-    method public static int makeFlag(int, int);
-    method public static int makeMovementFlags(int, int);
-    method public void onChildDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, float, float, int, boolean);
-    method public void onChildDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder!, float, float, int, boolean);
-    method public abstract boolean onMove(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void onMoved(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, androidx.recyclerview.widget.RecyclerView.ViewHolder, int, int, int);
-    method public void onSelectedChanged(androidx.recyclerview.widget.RecyclerView.ViewHolder?, int);
-    method public abstract void onSwiped(androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
-    field public static final int DEFAULT_DRAG_ANIMATION_DURATION = 200; // 0xc8
-    field public static final int DEFAULT_SWIPE_ANIMATION_DURATION = 250; // 0xfa
-  }
-
-  public abstract static class ItemTouchHelper.SimpleCallback extends androidx.recyclerview.widget.ItemTouchHelper.Callback {
-    ctor public ItemTouchHelper.SimpleCallback(int, int);
-    method public int getDragDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public int getMovementFlags(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public int getSwipeDirs(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void setDefaultDragDirs(int);
-    method public void setDefaultSwipeDirs(int);
-  }
-
-  public static interface ItemTouchHelper.ViewDropHandler {
-    method public void prepareForDrop(android.view.View, android.view.View, int, int);
-  }
-
-  public interface ItemTouchUIUtil {
-    method public void clearView(android.view.View!);
-    method public void onDraw(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
-    method public void onDrawOver(android.graphics.Canvas!, androidx.recyclerview.widget.RecyclerView!, android.view.View!, float, float, int, boolean);
-    method public void onSelected(android.view.View!);
-  }
-
-  public class LinearLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.ItemTouchHelper.ViewDropHandler androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
-    ctor public LinearLayoutManager(android.content.Context!);
-    ctor public LinearLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
-    ctor public LinearLayoutManager(android.content.Context!, int, boolean);
-    method protected void calculateExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State, int[]);
-    method public android.graphics.PointF! computeScrollVectorForPosition(int);
-    method public int findFirstCompletelyVisibleItemPosition();
-    method public int findFirstVisibleItemPosition();
-    method public int findLastCompletelyVisibleItemPosition();
-    method public int findLastVisibleItemPosition();
-    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
-    method @Deprecated protected int getExtraLayoutSpace(androidx.recyclerview.widget.RecyclerView.State!);
-    method public int getInitialPrefetchItemCount();
-    method public int getOrientation();
-    method public boolean getRecycleChildrenOnDetach();
-    method public boolean getReverseLayout();
-    method public boolean getStackFromEnd();
-    method protected boolean isLayoutRTL();
-    method public boolean isSmoothScrollbarEnabled();
-    method public void prepareForDrop(android.view.View, android.view.View, int, int);
-    method public void scrollToPositionWithOffset(int, int);
-    method public void setInitialPrefetchItemCount(int);
-    method public void setOrientation(int);
-    method public void setRecycleChildrenOnDetach(boolean);
-    method public void setReverseLayout(boolean);
-    method public void setSmoothScrollbarEnabled(boolean);
-    method public void setStackFromEnd(boolean);
-    field public static final int HORIZONTAL = 0; // 0x0
-    field public static final int INVALID_OFFSET = -2147483648; // 0x80000000
-    field public static final int VERTICAL = 1; // 0x1
-  }
-
-  protected static class LinearLayoutManager.LayoutChunkResult {
-    ctor protected LinearLayoutManager.LayoutChunkResult();
-    field public int mConsumed;
-    field public boolean mFinished;
-    field public boolean mFocusable;
-    field public boolean mIgnoreConsumed;
-  }
-
-  public class LinearSmoothScroller extends androidx.recyclerview.widget.RecyclerView.SmoothScroller {
-    ctor public LinearSmoothScroller(android.content.Context!);
-    method public int calculateDtToFit(int, int, int, int, int);
-    method public int calculateDxToMakeVisible(android.view.View!, int);
-    method public int calculateDyToMakeVisible(android.view.View!, int);
-    method protected float calculateSpeedPerPixel(android.util.DisplayMetrics!);
-    method protected int calculateTimeForDeceleration(int);
-    method protected int calculateTimeForScrolling(int);
-    method protected int getHorizontalSnapPreference();
-    method protected int getVerticalSnapPreference();
-    method protected void onSeekTargetStep(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
-    method protected void onStart();
-    method protected void onStop();
-    method protected void onTargetFound(android.view.View!, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
-    method protected void updateActionForInterimTarget(androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action!);
-    field public static final int SNAP_TO_ANY = 0; // 0x0
-    field public static final int SNAP_TO_END = 1; // 0x1
-    field public static final int SNAP_TO_START = -1; // 0xffffffff
-    field protected final android.view.animation.DecelerateInterpolator! mDecelerateInterpolator;
-    field protected int mInterimTargetDx;
-    field protected int mInterimTargetDy;
-    field protected final android.view.animation.LinearInterpolator! mLinearInterpolator;
-    field protected android.graphics.PointF! mTargetVector;
-  }
-
-  public class LinearSnapHelper extends androidx.recyclerview.widget.SnapHelper {
-    ctor public LinearSnapHelper();
-    method public int[]! calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
-    method public android.view.View! findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
-    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
-  }
-
-  public abstract class ListAdapter<T, VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> extends androidx.recyclerview.widget.RecyclerView.Adapter<VH> {
-    ctor protected ListAdapter(androidx.recyclerview.widget.AsyncDifferConfig<T!>);
-    ctor protected ListAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T!>);
-    method public java.util.List<T!> getCurrentList();
-    method protected T! getItem(int);
-    method public int getItemCount();
-    method public void onCurrentListChanged(java.util.List<T!>, java.util.List<T!>);
-    method public void submitList(java.util.List<T!>?);
-    method public void submitList(java.util.List<T!>?, Runnable?);
-  }
-
-  public interface ListUpdateCallback {
-    method public void onChanged(int, int, Object?);
-    method public void onInserted(int, int);
-    method public void onMoved(int, int);
-    method public void onRemoved(int, int);
-  }
-
-  public abstract class OrientationHelper {
-    method public static androidx.recyclerview.widget.OrientationHelper! createHorizontalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
-    method public static androidx.recyclerview.widget.OrientationHelper! createOrientationHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int);
-    method public static androidx.recyclerview.widget.OrientationHelper! createVerticalHelper(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
-    method public abstract int getDecoratedEnd(android.view.View!);
-    method public abstract int getDecoratedMeasurement(android.view.View!);
-    method public abstract int getDecoratedMeasurementInOther(android.view.View!);
-    method public abstract int getDecoratedStart(android.view.View!);
-    method public abstract int getEnd();
-    method public abstract int getEndAfterPadding();
-    method public abstract int getEndPadding();
-    method public androidx.recyclerview.widget.RecyclerView.LayoutManager! getLayoutManager();
-    method public abstract int getMode();
-    method public abstract int getModeInOther();
-    method public abstract int getStartAfterPadding();
-    method public abstract int getTotalSpace();
-    method public int getTotalSpaceChange();
-    method public abstract int getTransformedEndWithDecoration(android.view.View!);
-    method public abstract int getTransformedStartWithDecoration(android.view.View!);
-    method public abstract void offsetChild(android.view.View!, int);
-    method public abstract void offsetChildren(int);
-    method public void onLayoutComplete();
-    field public static final int HORIZONTAL = 0; // 0x0
-    field public static final int VERTICAL = 1; // 0x1
-    field protected final androidx.recyclerview.widget.RecyclerView.LayoutManager! mLayoutManager;
-  }
-
-  public class PagerSnapHelper extends androidx.recyclerview.widget.SnapHelper {
-    ctor public PagerSnapHelper();
-    method public int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
-    method public android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
-    method public int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
-  }
-
-  public class RecyclerView extends android.view.ViewGroup implements androidx.core.view.NestedScrollingChild2 androidx.core.view.NestedScrollingChild3 androidx.core.view.ScrollingView {
-    ctor public RecyclerView(android.content.Context);
-    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?);
-    ctor public RecyclerView(android.content.Context, android.util.AttributeSet?, int);
-    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
-    method public void addItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration, int);
-    method public void addOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
-    method public void addOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
-    method public void addOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
-    method public void addRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener);
-    method public void clearOnChildAttachStateChangeListeners();
-    method public void clearOnScrollListeners();
-    method public int computeHorizontalScrollExtent();
-    method public int computeHorizontalScrollOffset();
-    method public int computeHorizontalScrollRange();
-    method public int computeVerticalScrollExtent();
-    method public int computeVerticalScrollOffset();
-    method public int computeVerticalScrollRange();
-    method public boolean dispatchNestedPreScroll(int, int, int[]!, int[]!, int);
-    method public boolean dispatchNestedScroll(int, int, int, int, int[]!, int);
-    method public final void dispatchNestedScroll(int, int, int, int, int[]!, int, int[]);
-    method public boolean drawChild(android.graphics.Canvas, android.view.View!, long);
-    method public android.view.View? findChildViewUnder(float, float);
-    method public android.view.View? findContainingItemView(android.view.View);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findContainingViewHolder(android.view.View);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForAdapterPosition(int);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! findViewHolderForItemId(long);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForLayoutPosition(int);
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView.ViewHolder? findViewHolderForPosition(int);
-    method public boolean fling(int, int);
-    method public androidx.recyclerview.widget.RecyclerView.Adapter? getAdapter();
-    method public int getChildAdapterPosition(android.view.View);
-    method public long getChildItemId(android.view.View);
-    method public int getChildLayoutPosition(android.view.View);
-    method @Deprecated public int getChildPosition(android.view.View);
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder! getChildViewHolder(android.view.View);
-    method public androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate? getCompatAccessibilityDelegate();
-    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
-    method public androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory getEdgeEffectFactory();
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator? getItemAnimator();
-    method public androidx.recyclerview.widget.RecyclerView.ItemDecoration getItemDecorationAt(int);
-    method public int getItemDecorationCount();
-    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
-    method public int getMaxFlingVelocity();
-    method public int getMinFlingVelocity();
-    method public androidx.recyclerview.widget.RecyclerView.OnFlingListener? getOnFlingListener();
-    method public boolean getPreserveFocusAfterLayout();
-    method public androidx.recyclerview.widget.RecyclerView.RecycledViewPool getRecycledViewPool();
-    method public int getScrollState();
-    method public boolean hasFixedSize();
-    method public boolean hasNestedScrollingParent(int);
-    method public boolean hasPendingAdapterUpdates();
-    method public void invalidateItemDecorations();
-    method public boolean isAnimating();
-    method public boolean isComputingLayout();
-    method @Deprecated public boolean isLayoutFrozen();
-    method public final boolean isLayoutSuppressed();
-    method public void nestedScrollBy(int, int);
-    method public void offsetChildrenHorizontal(@Px int);
-    method public void offsetChildrenVertical(@Px int);
-    method public void onChildAttachedToWindow(android.view.View);
-    method public void onChildDetachedFromWindow(android.view.View);
-    method public void onDraw(android.graphics.Canvas);
-    method public void onScrollStateChanged(int);
-    method public void onScrolled(@Px int, @Px int);
-    method public void removeItemDecoration(androidx.recyclerview.widget.RecyclerView.ItemDecoration);
-    method public void removeItemDecorationAt(int);
-    method public void removeOnChildAttachStateChangeListener(androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener);
-    method public void removeOnItemTouchListener(androidx.recyclerview.widget.RecyclerView.OnItemTouchListener);
-    method public void removeOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener);
-    method public void removeRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener);
-    method public void scrollToPosition(int);
-    method public void setAccessibilityDelegateCompat(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate?);
-    method public void setAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?);
-    method public void setChildDrawingOrderCallback(androidx.recyclerview.widget.RecyclerView.ChildDrawingOrderCallback?);
-    method public static void setDebugAssertionsEnabled(boolean);
-    method public void setEdgeEffectFactory(androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory);
-    method public void setHasFixedSize(boolean);
-    method public void setItemAnimator(androidx.recyclerview.widget.RecyclerView.ItemAnimator?);
-    method public void setItemViewCacheSize(int);
-    method @Deprecated public void setLayoutFrozen(boolean);
-    method public void setLayoutManager(androidx.recyclerview.widget.RecyclerView.LayoutManager?);
-    method @Deprecated public void setLayoutTransition(android.animation.LayoutTransition!);
-    method public void setOnFlingListener(androidx.recyclerview.widget.RecyclerView.OnFlingListener?);
-    method @Deprecated public void setOnScrollListener(androidx.recyclerview.widget.RecyclerView.OnScrollListener?);
-    method public void setPreserveFocusAfterLayout(boolean);
-    method public void setRecycledViewPool(androidx.recyclerview.widget.RecyclerView.RecycledViewPool?);
-    method @Deprecated public void setRecyclerListener(androidx.recyclerview.widget.RecyclerView.RecyclerListener?);
-    method public void setScrollingTouchSlop(int);
-    method public static void setVerboseLoggingEnabled(boolean);
-    method public void setViewCacheExtension(androidx.recyclerview.widget.RecyclerView.ViewCacheExtension?);
-    method public void smoothScrollBy(@Px int, @Px int);
-    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?);
-    method public void smoothScrollBy(@Px int, @Px int, android.view.animation.Interpolator?, int);
-    method public void smoothScrollToPosition(int);
-    method public boolean startNestedScroll(int, int);
-    method public void stopNestedScroll(int);
-    method public void stopScroll();
-    method public final void suppressLayout(boolean);
-    method public void swapAdapter(androidx.recyclerview.widget.RecyclerView.Adapter?, boolean);
-    field public static final int HORIZONTAL = 0; // 0x0
-    field public static final int INVALID_TYPE = -1; // 0xffffffff
-    field public static final long NO_ID = -1L; // 0xffffffffffffffffL
-    field public static final int NO_POSITION = -1; // 0xffffffff
-    field public static final int SCROLL_STATE_DRAGGING = 1; // 0x1
-    field public static final int SCROLL_STATE_IDLE = 0; // 0x0
-    field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
-    field public static final int TOUCH_SLOP_DEFAULT = 0; // 0x0
-    field public static final int TOUCH_SLOP_PAGING = 1; // 0x1
-    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
-    field public static final int VERTICAL = 1; // 0x1
-  }
-
-  public abstract static class RecyclerView.Adapter<VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> {
-    ctor public RecyclerView.Adapter();
-    method public final void bindViewHolder(VH, int);
-    method public final VH createViewHolder(android.view.ViewGroup, int);
-    method public int findRelativeAdapterPositionIn(androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>, androidx.recyclerview.widget.RecyclerView.ViewHolder, int);
-    method public abstract int getItemCount();
-    method public long getItemId(int);
-    method public int getItemViewType(int);
-    method public final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy getStateRestorationPolicy();
-    method public final boolean hasObservers();
-    method public final boolean hasStableIds();
-    method public final void notifyDataSetChanged();
-    method public final void notifyItemChanged(int);
-    method public final void notifyItemChanged(int, Object?);
-    method public final void notifyItemInserted(int);
-    method public final void notifyItemMoved(int, int);
-    method public final void notifyItemRangeChanged(int, int);
-    method public final void notifyItemRangeChanged(int, int, Object?);
-    method public final void notifyItemRangeInserted(int, int);
-    method public final void notifyItemRangeRemoved(int, int);
-    method public final void notifyItemRemoved(int);
-    method public void onAttachedToRecyclerView(androidx.recyclerview.widget.RecyclerView);
-    method public abstract void onBindViewHolder(VH, int);
-    method public void onBindViewHolder(VH, int, java.util.List<java.lang.Object!>);
-    method public abstract VH onCreateViewHolder(android.view.ViewGroup, int);
-    method public void onDetachedFromRecyclerView(androidx.recyclerview.widget.RecyclerView);
-    method public boolean onFailedToRecycleView(VH);
-    method public void onViewAttachedToWindow(VH);
-    method public void onViewDetachedFromWindow(VH);
-    method public void onViewRecycled(VH);
-    method public void registerAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
-    method public void setHasStableIds(boolean);
-    method public void setStateRestorationPolicy(androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy);
-    method public void unregisterAdapterDataObserver(androidx.recyclerview.widget.RecyclerView.AdapterDataObserver);
-  }
-
-  public enum RecyclerView.Adapter.StateRestorationPolicy {
-    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy ALLOW;
-    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT;
-    enum_constant public static final androidx.recyclerview.widget.RecyclerView.Adapter.StateRestorationPolicy PREVENT_WHEN_EMPTY;
-  }
-
-  public abstract static class RecyclerView.AdapterDataObserver {
-    ctor public RecyclerView.AdapterDataObserver();
-    method public void onChanged();
-    method public void onItemRangeChanged(int, int);
-    method public void onItemRangeChanged(int, int, Object?);
-    method public void onItemRangeInserted(int, int);
-    method public void onItemRangeMoved(int, int, int);
-    method public void onItemRangeRemoved(int, int);
-    method public void onStateRestorationPolicyChanged();
-  }
-
-  public static interface RecyclerView.ChildDrawingOrderCallback {
-    method public int onGetChildDrawingOrder(int, int);
-  }
-
-  public static class RecyclerView.EdgeEffectFactory {
-    ctor public RecyclerView.EdgeEffectFactory();
-    method protected android.widget.EdgeEffect createEdgeEffect(androidx.recyclerview.widget.RecyclerView, @androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.EdgeDirection int);
-    field public static final int DIRECTION_BOTTOM = 3; // 0x3
-    field public static final int DIRECTION_LEFT = 0; // 0x0
-    field public static final int DIRECTION_RIGHT = 2; // 0x2
-    field public static final int DIRECTION_TOP = 1; // 0x1
-  }
-
-  @IntDef({androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_LEFT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_TOP, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_RIGHT, androidx.recyclerview.widget.RecyclerView.EdgeEffectFactory.DIRECTION_BOTTOM}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.EdgeEffectFactory.EdgeDirection {
-  }
-
-  public abstract static class RecyclerView.ItemAnimator {
-    ctor public RecyclerView.ItemAnimator();
-    method public abstract boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public abstract boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
-    method public abstract boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public boolean canReuseUpdatedViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder, java.util.List<java.lang.Object!>);
-    method public final void dispatchAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public final void dispatchAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public final void dispatchAnimationsFinished();
-    method public abstract void endAnimation(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public abstract void endAnimations();
-    method public long getAddDuration();
-    method public long getChangeDuration();
-    method public long getMoveDuration();
-    method public long getRemoveDuration();
-    method public abstract boolean isRunning();
-    method public final boolean isRunning(androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemAnimatorFinishedListener?);
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo obtainHolderInfo();
-    method public void onAnimationFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public void onAnimationStarted(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPostLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo recordPreLayoutInformation(androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int, java.util.List<java.lang.Object!>);
-    method public abstract void runPendingAnimations();
-    method public void setAddDuration(long);
-    method public void setChangeDuration(long);
-    method public void setMoveDuration(long);
-    method public void setRemoveDuration(long);
-    field public static final int FLAG_APPEARED_IN_PRE_LAYOUT = 4096; // 0x1000
-    field public static final int FLAG_CHANGED = 2; // 0x2
-    field public static final int FLAG_INVALIDATED = 4; // 0x4
-    field public static final int FLAG_MOVED = 2048; // 0x800
-    field public static final int FLAG_REMOVED = 8; // 0x8
-  }
-
-  @IntDef(flag=true, value={androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_CHANGED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_REMOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_MOVED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_INVALIDATED, androidx.recyclerview.widget.RecyclerView.ItemAnimator.FLAG_APPEARED_IN_PRE_LAYOUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface RecyclerView.ItemAnimator.AdapterChanges {
-  }
-
-  public static interface RecyclerView.ItemAnimator.ItemAnimatorFinishedListener {
-    method public void onAnimationsFinished();
-  }
-
-  public static class RecyclerView.ItemAnimator.ItemHolderInfo {
-    ctor public RecyclerView.ItemAnimator.ItemHolderInfo();
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-    method public androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo setFrom(androidx.recyclerview.widget.RecyclerView.ViewHolder, @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges int);
-    field public int bottom;
-    field @androidx.recyclerview.widget.RecyclerView.ItemAnimator.AdapterChanges public int changeFlags;
-    field public int left;
-    field public int right;
-    field public int top;
-  }
-
-  public abstract static class RecyclerView.ItemDecoration {
-    ctor public RecyclerView.ItemDecoration();
-    method public void getItemOffsets(android.graphics.Rect, android.view.View, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
-    method @Deprecated public void getItemOffsets(android.graphics.Rect, int, androidx.recyclerview.widget.RecyclerView);
-    method @Deprecated public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
-    method public void onDraw(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
-    method @Deprecated public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView);
-    method public void onDrawOver(android.graphics.Canvas, androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State);
-  }
-
-  public abstract static class RecyclerView.LayoutManager {
-    ctor public RecyclerView.LayoutManager();
-    method public void addDisappearingView(android.view.View!);
-    method public void addDisappearingView(android.view.View!, int);
-    method public void addView(android.view.View!);
-    method public void addView(android.view.View!, int);
-    method public void assertInLayoutOrScroll(String!);
-    method public void assertNotInLayoutOrScroll(String!);
-    method public void attachView(android.view.View);
-    method public void attachView(android.view.View, int);
-    method public void attachView(android.view.View, int, androidx.recyclerview.widget.RecyclerView.LayoutParams!);
-    method public void calculateItemDecorationsForChild(android.view.View, android.graphics.Rect);
-    method public boolean canScrollHorizontally();
-    method public boolean canScrollVertically();
-    method public boolean checkLayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
-    method public static int chooseSize(int, int, int);
-    method public void collectAdjacentPrefetchPositions(int, int, androidx.recyclerview.widget.RecyclerView.State!, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
-    method public void collectInitialPrefetchPositions(int, androidx.recyclerview.widget.RecyclerView.LayoutManager.LayoutPrefetchRegistry!);
-    method public int computeHorizontalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
-    method public int computeHorizontalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
-    method public int computeHorizontalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
-    method public int computeVerticalScrollExtent(androidx.recyclerview.widget.RecyclerView.State);
-    method public int computeVerticalScrollOffset(androidx.recyclerview.widget.RecyclerView.State);
-    method public int computeVerticalScrollRange(androidx.recyclerview.widget.RecyclerView.State);
-    method public void detachAndScrapAttachedViews(androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public void detachAndScrapView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public void detachAndScrapViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public void detachView(android.view.View);
-    method public void detachViewAt(int);
-    method public void endAnimation(android.view.View!);
-    method public android.view.View? findContainingItemView(android.view.View);
-    method public android.view.View? findViewByPosition(int);
-    method public abstract androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
-    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.content.Context!, android.util.AttributeSet!);
-    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getBaseline();
-    method public int getBottomDecorationHeight(android.view.View);
-    method public android.view.View? getChildAt(int);
-    method public int getChildCount();
-    method @Deprecated public static int getChildMeasureSpec(int, int, int, boolean);
-    method public static int getChildMeasureSpec(int, int, int, int, boolean);
-    method public boolean getClipToPadding();
-    method public int getColumnCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
-    method public int getDecoratedBottom(android.view.View);
-    method public void getDecoratedBoundsWithMargins(android.view.View, android.graphics.Rect);
-    method public int getDecoratedLeft(android.view.View);
-    method public int getDecoratedMeasuredHeight(android.view.View);
-    method public int getDecoratedMeasuredWidth(android.view.View);
-    method public int getDecoratedRight(android.view.View);
-    method public int getDecoratedTop(android.view.View);
-    method public android.view.View? getFocusedChild();
-    method @Px public int getHeight();
-    method public int getHeightMode();
-    method public int getItemCount();
-    method public int getItemViewType(android.view.View);
-    method public int getLayoutDirection();
-    method public int getLeftDecorationWidth(android.view.View);
-    method @Px public int getMinimumHeight();
-    method @Px public int getMinimumWidth();
-    method @Px public int getPaddingBottom();
-    method @Px public int getPaddingEnd();
-    method @Px public int getPaddingLeft();
-    method @Px public int getPaddingRight();
-    method @Px public int getPaddingStart();
-    method @Px public int getPaddingTop();
-    method public int getPosition(android.view.View);
-    method public static androidx.recyclerview.widget.RecyclerView.LayoutManager.Properties! getProperties(android.content.Context, android.util.AttributeSet?, int, int);
-    method public int getRightDecorationWidth(android.view.View);
-    method public int getRowCountForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
-    method public int getSelectionModeForAccessibility(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
-    method public int getTopDecorationHeight(android.view.View);
-    method public void getTransformedBoundingBox(android.view.View, boolean, android.graphics.Rect);
-    method @Px public int getWidth();
-    method public int getWidthMode();
-    method public boolean hasFocus();
-    method public void ignoreView(android.view.View);
-    method public boolean isAttachedToWindow();
-    method public boolean isAutoMeasureEnabled();
-    method public boolean isFocused();
-    method public final boolean isItemPrefetchEnabled();
-    method public boolean isLayoutHierarchical(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
-    method public boolean isMeasurementCacheEnabled();
-    method public boolean isSmoothScrolling();
-    method public boolean isViewPartiallyVisible(android.view.View, boolean, boolean);
-    method public void layoutDecorated(android.view.View, int, int, int, int);
-    method public void layoutDecoratedWithMargins(android.view.View, int, int, int, int);
-    method public void measureChild(android.view.View, int, int);
-    method public void measureChildWithMargins(android.view.View, int, int);
-    method public void moveView(int, int);
-    method public void offsetChildrenHorizontal(@Px int);
-    method public void offsetChildrenVertical(@Px int);
-    method public void onAdapterChanged(androidx.recyclerview.widget.RecyclerView.Adapter?, androidx.recyclerview.widget.RecyclerView.Adapter?);
-    method public boolean onAddFocusables(androidx.recyclerview.widget.RecyclerView, java.util.ArrayList<android.view.View!>, int, int);
-    method @CallSuper public void onAttachedToWindow(androidx.recyclerview.widget.RecyclerView!);
-    method @Deprecated public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!);
-    method @CallSuper public void onDetachedFromWindow(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.Recycler!);
-    method public android.view.View? onFocusSearchFailed(android.view.View, int, androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State);
-    method public void onInitializeAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
-    method public void onInitializeAccessibilityEvent(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.accessibility.AccessibilityEvent);
-    method public void onInitializeAccessibilityNodeInfo(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
-    method public void onInitializeAccessibilityNodeInfoForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, androidx.core.view.accessibility.AccessibilityNodeInfoCompat);
-    method public android.view.View? onInterceptFocusSearch(android.view.View, int);
-    method public void onItemsAdded(androidx.recyclerview.widget.RecyclerView, int, int);
-    method public void onItemsChanged(androidx.recyclerview.widget.RecyclerView);
-    method public void onItemsMoved(androidx.recyclerview.widget.RecyclerView, int, int, int);
-    method public void onItemsRemoved(androidx.recyclerview.widget.RecyclerView, int, int);
-    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int);
-    method public void onItemsUpdated(androidx.recyclerview.widget.RecyclerView, int, int, Object?);
-    method public void onLayoutChildren(androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
-    method public void onLayoutCompleted(androidx.recyclerview.widget.RecyclerView.State!);
-    method public void onMeasure(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, int);
-    method @Deprecated public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, android.view.View, android.view.View?);
-    method public boolean onRequestChildFocus(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.State, android.view.View, android.view.View?);
-    method public void onRestoreInstanceState(android.os.Parcelable!);
-    method public android.os.Parcelable? onSaveInstanceState();
-    method public void onScrollStateChanged(int);
-    method public boolean performAccessibilityAction(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, int, android.os.Bundle?);
-    method public boolean performAccessibilityActionForItem(androidx.recyclerview.widget.RecyclerView.Recycler, androidx.recyclerview.widget.RecyclerView.State, android.view.View, int, android.os.Bundle?);
-    method public void postOnAnimation(Runnable!);
-    method public void removeAllViews();
-    method public void removeAndRecycleAllViews(androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public void removeAndRecycleView(android.view.View, androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public void removeAndRecycleViewAt(int, androidx.recyclerview.widget.RecyclerView.Recycler);
-    method public boolean removeCallbacks(Runnable!);
-    method public void removeDetachedView(android.view.View);
-    method public void removeView(android.view.View!);
-    method public void removeViewAt(int);
-    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean);
-    method public boolean requestChildRectangleOnScreen(androidx.recyclerview.widget.RecyclerView, android.view.View, android.graphics.Rect, boolean, boolean);
-    method public void requestLayout();
-    method public void requestSimpleAnimationsInNextLayout();
-    method public int scrollHorizontallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
-    method public void scrollToPosition(int);
-    method public int scrollVerticallyBy(int, androidx.recyclerview.widget.RecyclerView.Recycler!, androidx.recyclerview.widget.RecyclerView.State!);
-    method @Deprecated public void setAutoMeasureEnabled(boolean);
-    method public final void setItemPrefetchEnabled(boolean);
-    method public void setMeasuredDimension(android.graphics.Rect!, int, int);
-    method public void setMeasuredDimension(int, int);
-    method public void setMeasurementCacheEnabled(boolean);
-    method public void smoothScrollToPosition(androidx.recyclerview.widget.RecyclerView!, androidx.recyclerview.widget.RecyclerView.State!, int);
-    method public void startSmoothScroll(androidx.recyclerview.widget.RecyclerView.SmoothScroller!);
-    method public void stopIgnoringView(android.view.View);
-    method public boolean supportsPredictiveItemAnimations();
-  }
-
-  public static interface RecyclerView.LayoutManager.LayoutPrefetchRegistry {
-    method public void addPosition(int, int);
-  }
-
-  public static class RecyclerView.LayoutManager.Properties {
-    ctor public RecyclerView.LayoutManager.Properties();
-    field public int orientation;
-    field public boolean reverseLayout;
-    field public int spanCount;
-    field public boolean stackFromEnd;
-  }
-
-  public static class RecyclerView.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
-    ctor public RecyclerView.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor public RecyclerView.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    ctor public RecyclerView.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
-    ctor public RecyclerView.LayoutParams(int, int);
-    method public int getAbsoluteAdapterPosition();
-    method public int getBindingAdapterPosition();
-    method @Deprecated public int getViewAdapterPosition();
-    method public int getViewLayoutPosition();
-    method @Deprecated public int getViewPosition();
-    method public boolean isItemChanged();
-    method public boolean isItemRemoved();
-    method public boolean isViewInvalid();
-    method public boolean viewNeedsUpdate();
-  }
-
-  public static interface RecyclerView.OnChildAttachStateChangeListener {
-    method public void onChildViewAttachedToWindow(android.view.View);
-    method public void onChildViewDetachedFromWindow(android.view.View);
-  }
-
-  public abstract static class RecyclerView.OnFlingListener {
-    ctor public RecyclerView.OnFlingListener();
-    method public abstract boolean onFling(int, int);
-  }
-
-  public static interface RecyclerView.OnItemTouchListener {
-    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
-    method public void onRequestDisallowInterceptTouchEvent(boolean);
-    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
-  }
-
-  public abstract static class RecyclerView.OnScrollListener {
-    ctor public RecyclerView.OnScrollListener();
-    method public void onScrollStateChanged(androidx.recyclerview.widget.RecyclerView, int);
-    method public void onScrolled(androidx.recyclerview.widget.RecyclerView, int, int);
-  }
-
-  public static class RecyclerView.RecycledViewPool {
-    ctor public RecyclerView.RecycledViewPool();
-    method public void clear();
-    method public androidx.recyclerview.widget.RecyclerView.ViewHolder? getRecycledView(int);
-    method public int getRecycledViewCount(int);
-    method public void putRecycledView(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void setMaxRecycledViews(int, int);
-  }
-
-  public final class RecyclerView.Recycler {
-    ctor public RecyclerView.Recycler();
-    method public void bindViewToPosition(android.view.View, int);
-    method public void clear();
-    method public int convertPreLayoutPositionToPostLayout(int);
-    method public java.util.List<androidx.recyclerview.widget.RecyclerView.ViewHolder!> getScrapList();
-    method public android.view.View getViewForPosition(int);
-    method public void recycleView(android.view.View);
-    method public void setViewCacheSize(int);
-  }
-
-  public static interface RecyclerView.RecyclerListener {
-    method public void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-  }
-
-  public static class RecyclerView.SimpleOnItemTouchListener implements androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
-    ctor public RecyclerView.SimpleOnItemTouchListener();
-    method public boolean onInterceptTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
-    method public void onRequestDisallowInterceptTouchEvent(boolean);
-    method public void onTouchEvent(androidx.recyclerview.widget.RecyclerView, android.view.MotionEvent);
-  }
-
-  public abstract static class RecyclerView.SmoothScroller {
-    ctor public RecyclerView.SmoothScroller();
-    method public android.graphics.PointF? computeScrollVectorForPosition(int);
-    method public android.view.View! findViewByPosition(int);
-    method public int getChildCount();
-    method public int getChildPosition(android.view.View!);
-    method public androidx.recyclerview.widget.RecyclerView.LayoutManager? getLayoutManager();
-    method public int getTargetPosition();
-    method @Deprecated public void instantScrollToPosition(int);
-    method public boolean isPendingInitialRun();
-    method public boolean isRunning();
-    method protected void normalize(android.graphics.PointF);
-    method protected void onChildAttachedToWindow(android.view.View!);
-    method protected abstract void onSeekTargetStep(@Px int, @Px int, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
-    method protected abstract void onStart();
-    method protected abstract void onStop();
-    method protected abstract void onTargetFound(android.view.View, androidx.recyclerview.widget.RecyclerView.State, androidx.recyclerview.widget.RecyclerView.SmoothScroller.Action);
-    method public void setTargetPosition(int);
-    method protected final void stop();
-  }
-
-  public static class RecyclerView.SmoothScroller.Action {
-    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int);
-    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int);
-    ctor public RecyclerView.SmoothScroller.Action(@Px int, @Px int, int, android.view.animation.Interpolator?);
-    method public int getDuration();
-    method @Px public int getDx();
-    method @Px public int getDy();
-    method public android.view.animation.Interpolator? getInterpolator();
-    method public void jumpTo(int);
-    method public void setDuration(int);
-    method public void setDx(@Px int);
-    method public void setDy(@Px int);
-    method public void setInterpolator(android.view.animation.Interpolator?);
-    method public void update(@Px int, @Px int, int, android.view.animation.Interpolator?);
-    field public static final int UNDEFINED_DURATION = -2147483648; // 0x80000000
-  }
-
-  public static interface RecyclerView.SmoothScroller.ScrollVectorProvider {
-    method public android.graphics.PointF? computeScrollVectorForPosition(int);
-  }
-
-  public static class RecyclerView.State {
-    ctor public RecyclerView.State();
-    method public boolean didStructureChange();
-    method public <T> T! get(int);
-    method public int getItemCount();
-    method public int getRemainingScrollHorizontal();
-    method public int getRemainingScrollVertical();
-    method public int getTargetScrollPosition();
-    method public boolean hasTargetScrollPosition();
-    method public boolean isMeasuring();
-    method public boolean isPreLayout();
-    method public void put(int, Object!);
-    method public void remove(int);
-    method public boolean willRunPredictiveAnimations();
-    method public boolean willRunSimpleAnimations();
-  }
-
-  public abstract static class RecyclerView.ViewCacheExtension {
-    ctor public RecyclerView.ViewCacheExtension();
-    method public abstract android.view.View? getViewForPositionAndType(androidx.recyclerview.widget.RecyclerView.Recycler, int, int);
-  }
-
-  public abstract static class RecyclerView.ViewHolder {
-    ctor public RecyclerView.ViewHolder(android.view.View);
-    method public final int getAbsoluteAdapterPosition();
-    method @Deprecated public final int getAdapterPosition();
-    method public final androidx.recyclerview.widget.RecyclerView.Adapter<? extends androidx.recyclerview.widget.RecyclerView.ViewHolder>? getBindingAdapter();
-    method public final int getBindingAdapterPosition();
-    method public final long getItemId();
-    method public final int getItemViewType();
-    method public final int getLayoutPosition();
-    method public final int getOldPosition();
-    method @Deprecated public final int getPosition();
-    method public final boolean isRecyclable();
-    method public final void setIsRecyclable(boolean);
-    field public final android.view.View itemView;
-  }
-
-  public class RecyclerViewAccessibilityDelegate extends androidx.core.view.AccessibilityDelegateCompat {
-    ctor public RecyclerViewAccessibilityDelegate(androidx.recyclerview.widget.RecyclerView);
-    method public androidx.core.view.AccessibilityDelegateCompat getItemDelegate();
-  }
-
-  public static class RecyclerViewAccessibilityDelegate.ItemDelegate extends androidx.core.view.AccessibilityDelegateCompat {
-    ctor public RecyclerViewAccessibilityDelegate.ItemDelegate(androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate);
-  }
-
-  public abstract class SimpleItemAnimator extends androidx.recyclerview.widget.RecyclerView.ItemAnimator {
-    ctor public SimpleItemAnimator();
-    method public abstract boolean animateAdd(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public boolean animateAppearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public abstract boolean animateChange(androidx.recyclerview.widget.RecyclerView.ViewHolder!, androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
-    method public boolean animateDisappearance(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo?);
-    method public abstract boolean animateMove(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, int, int, int);
-    method public boolean animatePersistence(androidx.recyclerview.widget.RecyclerView.ViewHolder, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo, androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo);
-    method public abstract boolean animateRemove(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
-    method public final void dispatchChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
-    method public final void dispatchMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void dispatchRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public boolean getSupportsChangeAnimations();
-    method public void onAddFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void onAddStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void onChangeFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
-    method public void onChangeStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!, boolean);
-    method public void onMoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void onMoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void onRemoveFinished(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void onRemoveStarting(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void setSupportsChangeAnimations(boolean);
-  }
-
-  public abstract class SnapHelper extends androidx.recyclerview.widget.RecyclerView.OnFlingListener {
-    ctor public SnapHelper();
-    method public void attachToRecyclerView(androidx.recyclerview.widget.RecyclerView?) throws java.lang.IllegalStateException;
-    method public abstract int[]? calculateDistanceToFinalSnap(androidx.recyclerview.widget.RecyclerView.LayoutManager, android.view.View);
-    method public int[]! calculateScrollDistance(int, int);
-    method protected androidx.recyclerview.widget.RecyclerView.SmoothScroller? createScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
-    method @Deprecated protected androidx.recyclerview.widget.LinearSmoothScroller? createSnapScroller(androidx.recyclerview.widget.RecyclerView.LayoutManager);
-    method public abstract android.view.View? findSnapView(androidx.recyclerview.widget.RecyclerView.LayoutManager!);
-    method public abstract int findTargetSnapPosition(androidx.recyclerview.widget.RecyclerView.LayoutManager!, int, int);
-    method public boolean onFling(int, int);
-  }
-
-  public class SortedList<T> {
-    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>);
-    ctor public SortedList(Class<T!>, androidx.recyclerview.widget.SortedList.Callback<T!>, int);
-    method public int add(T!);
-    method public void addAll(java.util.Collection<T!>);
-    method public void addAll(T!...);
-    method public void addAll(T![], boolean);
-    method public void beginBatchedUpdates();
-    method public void clear();
-    method public void endBatchedUpdates();
-    method public T! get(int) throws java.lang.IndexOutOfBoundsException;
-    method public int indexOf(T!);
-    method public void recalculatePositionOfItemAt(int);
-    method public boolean remove(T!);
-    method public T! removeItemAt(int);
-    method public void replaceAll(java.util.Collection<T!>);
-    method public void replaceAll(T!...);
-    method public void replaceAll(T![], boolean);
-    method public int size();
-    method public void updateItemAt(int, T!);
-    field public static final int INVALID_POSITION = -1; // 0xffffffff
-  }
-
-  public static class SortedList.BatchedCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
-    ctor public SortedList.BatchedCallback(androidx.recyclerview.widget.SortedList.Callback<T2!>!);
-    method public boolean areContentsTheSame(T2!, T2!);
-    method public boolean areItemsTheSame(T2!, T2!);
-    method public int compare(T2!, T2!);
-    method public void dispatchLastEvent();
-    method public void onChanged(int, int);
-    method public void onInserted(int, int);
-    method public void onMoved(int, int);
-    method public void onRemoved(int, int);
-  }
-
-  public abstract static class SortedList.Callback<T2> implements java.util.Comparator<T2> androidx.recyclerview.widget.ListUpdateCallback {
-    ctor public SortedList.Callback();
-    method public abstract boolean areContentsTheSame(T2!, T2!);
-    method public abstract boolean areItemsTheSame(T2!, T2!);
-    method public abstract int compare(T2!, T2!);
-    method public Object? getChangePayload(T2!, T2!);
-    method public abstract void onChanged(int, int);
-    method public void onChanged(int, int, Object!);
-  }
-
-  public abstract class SortedListAdapterCallback<T2> extends androidx.recyclerview.widget.SortedList.Callback<T2> {
-    ctor public SortedListAdapterCallback(androidx.recyclerview.widget.RecyclerView.Adapter<?>!);
-    method public void onChanged(int, int);
-    method public void onInserted(int, int);
-    method public void onMoved(int, int);
-    method public void onRemoved(int, int);
-  }
-
-  public class StaggeredGridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager implements androidx.recyclerview.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
-    ctor public StaggeredGridLayoutManager(android.content.Context!, android.util.AttributeSet!, int, int);
-    ctor public StaggeredGridLayoutManager(int, int);
-    method public android.graphics.PointF! computeScrollVectorForPosition(int);
-    method public int[]! findFirstCompletelyVisibleItemPositions(int[]!);
-    method public int[]! findFirstVisibleItemPositions(int[]!);
-    method public int[]! findLastCompletelyVisibleItemPositions(int[]!);
-    method public int[]! findLastVisibleItemPositions(int[]!);
-    method public androidx.recyclerview.widget.RecyclerView.LayoutParams! generateDefaultLayoutParams();
-    method public int getGapStrategy();
-    method public int getOrientation();
-    method public boolean getReverseLayout();
-    method public int getSpanCount();
-    method public void invalidateSpanAssignments();
-    method public void scrollToPositionWithOffset(int, int);
-    method public void setGapStrategy(int);
-    method public void setOrientation(int);
-    method public void setReverseLayout(boolean);
-    method public void setSpanCount(int);
-    field @Deprecated public static final int GAP_HANDLING_LAZY = 1; // 0x1
-    field public static final int GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS = 2; // 0x2
-    field public static final int GAP_HANDLING_NONE = 0; // 0x0
-    field public static final int HORIZONTAL = 0; // 0x0
-    field public static final int VERTICAL = 1; // 0x1
-  }
-
-  public static class StaggeredGridLayoutManager.LayoutParams extends androidx.recyclerview.widget.RecyclerView.LayoutParams {
-    ctor public StaggeredGridLayoutManager.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor public StaggeredGridLayoutManager.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    ctor public StaggeredGridLayoutManager.LayoutParams(androidx.recyclerview.widget.RecyclerView.LayoutParams!);
-    ctor public StaggeredGridLayoutManager.LayoutParams(int, int);
-    method public final int getSpanIndex();
-    method public boolean isFullSpan();
-    method public void setFullSpan(boolean);
-    field public static final int INVALID_SPAN_ID = -1; // 0xffffffff
-  }
-
-}
-
diff --git a/remotecallback/remotecallback/api/public_plus_experimental_current.txt b/remotecallback/remotecallback/api/public_plus_experimental_current.txt
deleted file mode 100644
index 7dee39c..0000000
--- a/remotecallback/remotecallback/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Signature format: 4.0
-package androidx.remotecallback {
-
-  public class AppWidgetProviderWithCallbacks<T extends androidx.remotecallback.CallbackReceiver> extends android.appwidget.AppWidgetProvider implements androidx.remotecallback.CallbackReceiver<T> {
-    ctor public AppWidgetProviderWithCallbacks();
-    method public T createRemoteCallback(android.content.Context);
-  }
-
-  public abstract class BroadcastReceiverWithCallbacks<T extends androidx.remotecallback.CallbackReceiver> extends android.content.BroadcastReceiver implements androidx.remotecallback.CallbackReceiver<T> {
-    ctor public BroadcastReceiverWithCallbacks();
-    method public T createRemoteCallback(android.content.Context);
-    method public void onReceive(android.content.Context!, android.content.Intent!);
-    field public static final String ACTION_BROADCAST_CALLBACK = "androidx.remotecallback.action.BROADCAST_CALLBACK";
-  }
-
-  public class CallbackHandlerRegistry {
-    ctor public CallbackHandlerRegistry();
-    method public <T extends androidx.remotecallback.CallbackReceiver> void invokeCallback(android.content.Context, T!, android.content.Intent);
-    method public <T extends androidx.remotecallback.CallbackReceiver> void invokeCallback(android.content.Context, T!, android.os.Bundle);
-    method public static <T extends androidx.remotecallback.CallbackReceiver> void registerCallbackHandler(Class<T!>, String, androidx.remotecallback.CallbackHandlerRegistry.CallbackHandler<T!>?);
-    method public static androidx.remotecallback.RemoteCallback? stubToRemoteCallback(androidx.remotecallback.CallbackReceiver, Class<? extends androidx.remotecallback.CallbackReceiver>, android.os.Bundle, String?);
-  }
-
-  public static interface CallbackHandlerRegistry.CallbackHandler<T extends androidx.remotecallback.CallbackReceiver> {
-    method public void executeCallback(android.content.Context, T!, android.os.Bundle);
-  }
-
-  public interface CallbackReceiver<T> {
-    method public T createRemoteCallback(android.content.Context);
-  }
-
-  public abstract class ContentProviderWithCallbacks<T extends androidx.remotecallback.ContentProviderWithCallbacks> extends android.content.ContentProvider implements androidx.remotecallback.CallbackReceiver<T> {
-    ctor public ContentProviderWithCallbacks();
-    method public T createRemoteCallback(android.content.Context);
-  }
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target(java.lang.annotation.ElementType.PARAMETER) public @interface ExternalInput {
-    method public abstract String value();
-  }
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) public @interface RemoteCallable {
-  }
-
-  public class RemoteCallback {
-    method public static <T extends androidx.remotecallback.CallbackReceiver> T! create(Class<T!>!, android.content.Context!);
-    method public android.os.Bundle! getArgumentBundle();
-    method public String! getMethodName();
-    method public String getReceiverClass();
-    method public int getType();
-    method public android.app.PendingIntent! toPendingIntent();
-    field public static final androidx.remotecallback.RemoteCallback! LOCAL;
-    field public static final int TYPE_PROVIDER = 1; // 0x1
-    field public static final int TYPE_RECEIVER = 0; // 0x0
-  }
-
-}
-
diff --git a/resourceinspection/resourceinspection-annotation/api/public_plus_experimental_current.txt b/resourceinspection/resourceinspection-annotation/api/public_plus_experimental_current.txt
deleted file mode 100644
index 2962da1..0000000
--- a/resourceinspection/resourceinspection-annotation/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Signature format: 4.0
-package androidx.resourceinspection.annotation {
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) public @interface Attribute {
-    method public abstract androidx.resourceinspection.annotation.Attribute.IntMap[] intMapping() default {};
-    method public abstract String value();
-  }
-
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({}) public static @interface Attribute.IntMap {
-    method public abstract int mask() default 0;
-    method public abstract String name();
-    method public abstract int value();
-  }
-
-}
-
diff --git a/room/room-common/api/public_plus_experimental_current.txt b/room/room-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index 95d009b..0000000
--- a/room/room-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,415 +0,0 @@
-// Signature format: 4.0
-package androidx.room {
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface AutoMigration {
-    method public abstract int from();
-    method public abstract kotlin.reflect.KClass<?> spec() default java.lang.Object;
-    method public abstract int to();
-    property public abstract int from;
-    property public abstract kotlin.reflect.KClass<?> spec;
-    property public abstract int to;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={}) public @interface BuiltInTypeConverters {
-    method public abstract androidx.room.BuiltInTypeConverters.State byteBuffer() default androidx.room.BuiltInTypeConverters.State.INHERITED;
-    method public abstract androidx.room.BuiltInTypeConverters.State enums() default androidx.room.BuiltInTypeConverters.State.INHERITED;
-    method public abstract androidx.room.BuiltInTypeConverters.State uuid() default androidx.room.BuiltInTypeConverters.State.INHERITED;
-    property public abstract androidx.room.BuiltInTypeConverters.State byteBuffer;
-    property public abstract androidx.room.BuiltInTypeConverters.State enums;
-    property public abstract androidx.room.BuiltInTypeConverters.State uuid;
-  }
-
-  public enum BuiltInTypeConverters.State {
-    method public static androidx.room.BuiltInTypeConverters.State valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.room.BuiltInTypeConverters.State[] values();
-    enum_constant public static final androidx.room.BuiltInTypeConverters.State DISABLED;
-    enum_constant public static final androidx.room.BuiltInTypeConverters.State ENABLED;
-    enum_constant public static final androidx.room.BuiltInTypeConverters.State INHERITED;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ColumnInfo {
-    method @androidx.room.ColumnInfo.Collate public abstract int collate() default androidx.room.ColumnInfo.UNSPECIFIED;
-    method public abstract String defaultValue() default androidx.room.ColumnInfo.VALUE_UNSPECIFIED;
-    method public abstract boolean index() default false;
-    method public abstract String name() default androidx.room.ColumnInfo.INHERIT_FIELD_NAME;
-    method @androidx.room.ColumnInfo.SQLiteTypeAffinity public abstract int typeAffinity() default androidx.room.ColumnInfo.UNDEFINED;
-    property @androidx.room.ColumnInfo.Collate public abstract int collate;
-    property public abstract String defaultValue;
-    property public abstract boolean index;
-    property public abstract String name;
-    property @androidx.room.ColumnInfo.SQLiteTypeAffinity public abstract int typeAffinity;
-    field public static final int BINARY = 2; // 0x2
-    field public static final int BLOB = 5; // 0x5
-    field public static final androidx.room.ColumnInfo.Companion Companion;
-    field public static final String INHERIT_FIELD_NAME = "[field-name]";
-    field public static final int INTEGER = 3; // 0x3
-    field @RequiresApi(21) public static final int LOCALIZED = 5; // 0x5
-    field public static final int NOCASE = 3; // 0x3
-    field public static final int REAL = 4; // 0x4
-    field public static final int RTRIM = 4; // 0x4
-    field public static final int TEXT = 2; // 0x2
-    field public static final int UNDEFINED = 1; // 0x1
-    field @RequiresApi(21) public static final int UNICODE = 6; // 0x6
-    field public static final int UNSPECIFIED = 1; // 0x1
-    field public static final String VALUE_UNSPECIFIED = "[value-unspecified]";
-  }
-
-  @IntDef({androidx.room.ColumnInfo.UNSPECIFIED, androidx.room.ColumnInfo.BINARY, androidx.room.ColumnInfo.NOCASE, androidx.room.ColumnInfo.RTRIM, androidx.room.ColumnInfo.LOCALIZED, androidx.room.ColumnInfo.UNICODE}) @RequiresApi(21) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public static @interface ColumnInfo.Collate {
-  }
-
-  public static final class ColumnInfo.Companion {
-    field public static final int BINARY = 2; // 0x2
-    field public static final int BLOB = 5; // 0x5
-    field public static final String INHERIT_FIELD_NAME = "[field-name]";
-    field public static final int INTEGER = 3; // 0x3
-    field @RequiresApi(21) public static final int LOCALIZED = 5; // 0x5
-    field public static final int NOCASE = 3; // 0x3
-    field public static final int REAL = 4; // 0x4
-    field public static final int RTRIM = 4; // 0x4
-    field public static final int TEXT = 2; // 0x2
-    field public static final int UNDEFINED = 1; // 0x1
-    field @RequiresApi(21) public static final int UNICODE = 6; // 0x6
-    field public static final int UNSPECIFIED = 1; // 0x1
-    field public static final String VALUE_UNSPECIFIED = "[value-unspecified]";
-  }
-
-  @IntDef({androidx.room.ColumnInfo.UNDEFINED, androidx.room.ColumnInfo.TEXT, androidx.room.ColumnInfo.INTEGER, androidx.room.ColumnInfo.REAL, androidx.room.ColumnInfo.BLOB}) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public static @interface ColumnInfo.SQLiteTypeAffinity {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Dao {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Database {
-    method public abstract androidx.room.AutoMigration[] autoMigrations();
-    method public abstract kotlin.reflect.KClass<?>[] entities();
-    method public abstract boolean exportSchema() default true;
-    method public abstract int version();
-    method public abstract kotlin.reflect.KClass<?>[] views();
-    property public abstract androidx.room.AutoMigration[] autoMigrations;
-    property public abstract kotlin.reflect.KClass<?>[] entities;
-    property public abstract boolean exportSchema;
-    property public abstract int version;
-    property public abstract kotlin.reflect.KClass<?>[] views;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface DatabaseView {
-    method public abstract String value() default "";
-    method public abstract String viewName() default "";
-    property public abstract String value;
-    property public abstract String viewName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface Delete {
-    method public abstract kotlin.reflect.KClass<?> entity() default java.lang.Object;
-    property public abstract kotlin.reflect.KClass<?> entity;
-  }
-
-  @java.lang.annotation.Repeatable(DeleteColumn.Entries::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface DeleteColumn {
-    method public abstract String columnName();
-    method public abstract String tableName();
-    property public abstract String columnName;
-    property public abstract String tableName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface DeleteColumn.Entries {
-    method public abstract androidx.room.DeleteColumn[] value();
-    property public abstract androidx.room.DeleteColumn[] value;
-  }
-
-  @java.lang.annotation.Repeatable(DeleteTable.Entries::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface DeleteTable {
-    method public abstract String tableName();
-    property public abstract String tableName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface DeleteTable.Entries {
-    method public abstract androidx.room.DeleteTable[] value();
-    property public abstract androidx.room.DeleteTable[] value;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface Embedded {
-    method public abstract String prefix() default "";
-    property public abstract String prefix;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Entity {
-    method public abstract androidx.room.ForeignKey[] foreignKeys();
-    method public abstract String[] ignoredColumns();
-    method public abstract androidx.room.Index[] indices();
-    method public abstract boolean inheritSuperIndices() default false;
-    method public abstract String[] primaryKeys();
-    method public abstract String tableName() default "";
-    property public abstract androidx.room.ForeignKey[] foreignKeys;
-    property public abstract String[] ignoredColumns;
-    property public abstract androidx.room.Index[] indices;
-    property public abstract boolean inheritSuperIndices;
-    property public abstract String[] primaryKeys;
-    property public abstract String tableName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={}) public @interface ForeignKey {
-    method public abstract String[] childColumns();
-    method public abstract boolean deferred() default false;
-    method public abstract kotlin.reflect.KClass<?> entity();
-    method @androidx.room.ForeignKey.Action public abstract int onDelete() default androidx.room.ForeignKey.NO_ACTION;
-    method @androidx.room.ForeignKey.Action public abstract int onUpdate() default androidx.room.ForeignKey.NO_ACTION;
-    method public abstract String[] parentColumns();
-    property public abstract String[] childColumns;
-    property public abstract boolean deferred;
-    property public abstract kotlin.reflect.KClass<?> entity;
-    property @androidx.room.ForeignKey.Action public abstract int onDelete;
-    property @androidx.room.ForeignKey.Action public abstract int onUpdate;
-    property public abstract String[] parentColumns;
-    field public static final int CASCADE = 5; // 0x5
-    field public static final androidx.room.ForeignKey.Companion Companion;
-    field public static final int NO_ACTION = 1; // 0x1
-    field public static final int RESTRICT = 2; // 0x2
-    field public static final int SET_DEFAULT = 4; // 0x4
-    field public static final int SET_NULL = 3; // 0x3
-  }
-
-  @IntDef({androidx.room.ForeignKey.NO_ACTION, androidx.room.ForeignKey.RESTRICT, androidx.room.ForeignKey.SET_NULL, androidx.room.ForeignKey.SET_DEFAULT, androidx.room.ForeignKey.CASCADE}) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public static @interface ForeignKey.Action {
-  }
-
-  public static final class ForeignKey.Companion {
-    field public static final int CASCADE = 5; // 0x5
-    field public static final int NO_ACTION = 1; // 0x1
-    field public static final int RESTRICT = 2; // 0x2
-    field public static final int SET_DEFAULT = 4; // 0x4
-    field public static final int SET_NULL = 3; // 0x3
-  }
-
-  @RequiresApi(16) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Fts3 {
-    method public abstract String tokenizer() default androidx.room.FtsOptions.TOKENIZER_SIMPLE;
-    method public abstract String[] tokenizerArgs();
-    property public abstract String tokenizer;
-    property public abstract String[] tokenizerArgs;
-  }
-
-  @RequiresApi(16) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface Fts4 {
-    method public abstract kotlin.reflect.KClass<?> contentEntity() default java.lang.Object;
-    method public abstract String languageId() default "";
-    method public abstract androidx.room.FtsOptions.MatchInfo matchInfo() default androidx.room.FtsOptions.MatchInfo.FTS4;
-    method public abstract String[] notIndexed();
-    method public abstract androidx.room.FtsOptions.Order order() default androidx.room.FtsOptions.Order.ASC;
-    method public abstract int[] prefix();
-    method public abstract String tokenizer() default androidx.room.FtsOptions.TOKENIZER_SIMPLE;
-    method public abstract String[] tokenizerArgs();
-    property public abstract kotlin.reflect.KClass<?> contentEntity;
-    property public abstract String languageId;
-    property public abstract androidx.room.FtsOptions.MatchInfo matchInfo;
-    property public abstract String[] notIndexed;
-    property public abstract androidx.room.FtsOptions.Order order;
-    property public abstract int[] prefix;
-    property public abstract String tokenizer;
-    property public abstract String[] tokenizerArgs;
-  }
-
-  public final class FtsOptions {
-    field public static final androidx.room.FtsOptions INSTANCE;
-    field public static final String TOKENIZER_ICU = "icu";
-    field public static final String TOKENIZER_PORTER = "porter";
-    field public static final String TOKENIZER_SIMPLE = "simple";
-    field @RequiresApi(21) public static final String TOKENIZER_UNICODE61 = "unicode61";
-  }
-
-  public enum FtsOptions.MatchInfo {
-    method public static androidx.room.FtsOptions.MatchInfo valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.room.FtsOptions.MatchInfo[] values();
-    enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS3;
-    enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS4;
-  }
-
-  public enum FtsOptions.Order {
-    method public static androidx.room.FtsOptions.Order valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.room.FtsOptions.Order[] values();
-    enum_constant public static final androidx.room.FtsOptions.Order ASC;
-    enum_constant public static final androidx.room.FtsOptions.Order DESC;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.CONSTRUCTOR, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface Ignore {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={}) public @interface Index {
-    method public abstract String name() default "";
-    method public abstract androidx.room.Index.Order[] orders();
-    method public abstract boolean unique() default false;
-    method public abstract String[] value();
-    property public abstract String name;
-    property public abstract androidx.room.Index.Order[] orders;
-    property public abstract boolean unique;
-    property public abstract String[] value;
-  }
-
-  public enum Index.Order {
-    method public static androidx.room.Index.Order valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.room.Index.Order[] values();
-    enum_constant public static final androidx.room.Index.Order ASC;
-    enum_constant public static final androidx.room.Index.Order DESC;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface Insert {
-    method public abstract kotlin.reflect.KClass<?> entity() default java.lang.Object;
-    method @androidx.room.OnConflictStrategy public abstract int onConflict() default androidx.room.OnConflictStrategy.ABORT;
-    property public abstract kotlin.reflect.KClass<?> entity;
-    property @androidx.room.OnConflictStrategy public abstract int onConflict;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={}) public @interface Junction {
-    method public abstract String entityColumn() default "";
-    method public abstract String parentColumn() default "";
-    method public abstract kotlin.reflect.KClass<?> value();
-    property public abstract String entityColumn;
-    property public abstract String parentColumn;
-    property public abstract kotlin.reflect.KClass<?> value;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface MapInfo {
-    method public abstract String keyColumn() default "";
-    method public abstract String keyTable() default "";
-    method public abstract String valueColumn() default "";
-    method public abstract String valueTable() default "";
-    property public abstract String keyColumn;
-    property public abstract String keyTable;
-    property public abstract String valueColumn;
-    property public abstract String valueTable;
-  }
-
-  @IntDef({androidx.room.OnConflictStrategy.Companion.NONE, androidx.room.OnConflictStrategy.Companion.REPLACE, androidx.room.OnConflictStrategy.Companion.ROLLBACK, androidx.room.OnConflictStrategy.Companion.ABORT, androidx.room.OnConflictStrategy.Companion.FAIL, androidx.room.OnConflictStrategy.Companion.IGNORE}) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface OnConflictStrategy {
-    field public static final int ABORT = 3; // 0x3
-    field public static final androidx.room.OnConflictStrategy.Companion Companion;
-    field @Deprecated public static final int FAIL = 4; // 0x4
-    field public static final int IGNORE = 5; // 0x5
-    field public static final int NONE = 0; // 0x0
-    field public static final int REPLACE = 1; // 0x1
-    field @Deprecated public static final int ROLLBACK = 2; // 0x2
-  }
-
-  public static final class OnConflictStrategy.Companion {
-    field public static final int ABORT = 3; // 0x3
-    field @Deprecated public static final int FAIL = 4; // 0x4
-    field public static final int IGNORE = 5; // 0x5
-    field public static final int NONE = 0; // 0x0
-    field public static final int REPLACE = 1; // 0x1
-    field @Deprecated public static final int ROLLBACK = 2; // 0x2
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface PrimaryKey {
-    method public abstract boolean autoGenerate() default false;
-    property public abstract boolean autoGenerate;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface ProvidedAutoMigrationSpec {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface ProvidedTypeConverter {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER}) public @interface Query {
-    method public abstract String value();
-    property public abstract String value;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface RawQuery {
-    method public abstract kotlin.reflect.KClass<?>[] observedEntities();
-    property public abstract kotlin.reflect.KClass<?>[] observedEntities;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface Relation {
-    method public abstract androidx.room.Junction associateBy() default androidx.room.Junction(java.lang.Object);
-    method public abstract kotlin.reflect.KClass<?> entity() default java.lang.Object;
-    method public abstract String entityColumn();
-    method public abstract String parentColumn();
-    method public abstract String[] projection();
-    property public abstract androidx.room.Junction associateBy;
-    property public abstract kotlin.reflect.KClass<?> entity;
-    property public abstract String entityColumn;
-    property public abstract String parentColumn;
-    property public abstract String[] projection;
-  }
-
-  @java.lang.annotation.Repeatable(RenameColumn.Entries::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface RenameColumn {
-    method public abstract String fromColumnName();
-    method public abstract String tableName();
-    method public abstract String toColumnName();
-    property public abstract String fromColumnName;
-    property public abstract String tableName;
-    property public abstract String toColumnName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface RenameColumn.Entries {
-    method public abstract androidx.room.RenameColumn[] value();
-    property public abstract androidx.room.RenameColumn[] value;
-  }
-
-  @java.lang.annotation.Repeatable(RenameTable.Entries::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface RenameTable {
-    method public abstract String fromTableName();
-    method public abstract String toTableName();
-    property public abstract String fromTableName;
-    property public abstract String toTableName;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface RenameTable.Entries {
-    method public abstract androidx.room.RenameTable[] value();
-    property public abstract androidx.room.RenameTable[] value;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS}) public @interface RewriteQueriesToDropUnusedColumns {
-  }
-
-  public class RoomWarnings {
-    ctor @Deprecated public RoomWarnings();
-    field public static final String AMBIGUOUS_COLUMN_IN_RESULT = "ROOM_AMBIGUOUS_COLUMN_IN_RESULT";
-    field public static final String CANNOT_CREATE_VERIFICATION_DATABASE = "ROOM_CANNOT_CREATE_VERIFICATION_DATABASE";
-    field public static final String CURSOR_MISMATCH = "ROOM_CURSOR_MISMATCH";
-    field public static final androidx.room.RoomWarnings.Companion Companion;
-    field public static final String DEFAULT_CONSTRUCTOR = "ROOM_DEFAULT_CONSTRUCTOR";
-    field public static final String DOES_NOT_IMPLEMENT_EQUALS_HASHCODE = "ROOM_TYPE_DOES_NOT_IMPLEMENT_EQUALS_HASHCODE";
-    field public static final String INDEX_FROM_EMBEDDED_ENTITY_IS_DROPPED = "ROOM_EMBEDDED_ENTITY_INDEX_IS_DROPPED";
-    field public static final String INDEX_FROM_EMBEDDED_FIELD_IS_DROPPED = "ROOM_EMBEDDED_INDEX_IS_DROPPED";
-    field public static final String INDEX_FROM_PARENT_FIELD_IS_DROPPED = "ROOM_PARENT_FIELD_INDEX_IS_DROPPED";
-    field public static final String INDEX_FROM_PARENT_IS_DROPPED = "ROOM_PARENT_INDEX_IS_DROPPED";
-    field public static final String MISMATCHED_GETTER = "ROOM_MISMATCHED_GETTER_TYPE";
-    field public static final String MISMATCHED_SETTER = "ROOM_MISMATCHED_SETTER_TYPE";
-    field public static final String MISSING_INDEX_ON_FOREIGN_KEY_CHILD = "ROOM_MISSING_FOREIGN_KEY_CHILD_INDEX";
-    field public static final String MISSING_INDEX_ON_JUNCTION = "MISSING_INDEX_ON_JUNCTION";
-    field public static final String MISSING_JAVA_TMP_DIR = "ROOM_MISSING_JAVA_TMP_DIR";
-    field public static final String MISSING_SCHEMA_LOCATION = "ROOM_MISSING_SCHEMA_LOCATION";
-    field public static final String PRIMARY_KEY_FROM_EMBEDDED_IS_DROPPED = "ROOM_EMBEDDED_PRIMARY_KEY_IS_DROPPED";
-    field public static final String RELATION_QUERY_WITHOUT_TRANSACTION = "ROOM_RELATION_QUERY_WITHOUT_TRANSACTION";
-    field public static final String RELATION_TYPE_MISMATCH = "ROOM_RELATION_TYPE_MISMATCH";
-    field public static final String UNNECESSARY_NULLABILITY_IN_DAO_RETURN_TYPE = "ROOM_UNNECESSARY_NULLABILITY_IN_DAO_RETURN_TYPE";
-  }
-
-  public static final class RoomWarnings.Companion {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS}) public @interface SkipQueryVerification {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface Transaction {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface TypeConverter {
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.CLASS}) public @interface TypeConverters {
-    method public abstract androidx.room.BuiltInTypeConverters builtInTypeConverters() default androidx.room.BuiltInTypeConverters();
-    method public abstract kotlin.reflect.KClass<?>[] value();
-    property public abstract androidx.room.BuiltInTypeConverters builtInTypeConverters;
-    property public abstract kotlin.reflect.KClass<?>[] value;
-  }
-
-  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface Update {
-    method public abstract kotlin.reflect.KClass<?> entity() default java.lang.Object;
-    method @androidx.room.OnConflictStrategy public abstract int onConflict() default androidx.room.OnConflictStrategy.ABORT;
-    property public abstract kotlin.reflect.KClass<?> entity;
-    property @androidx.room.OnConflictStrategy public abstract int onConflict;
-  }
-
-  @RequiresApi(16) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface Upsert {
-    method public abstract kotlin.reflect.KClass<?> entity() default java.lang.Object;
-    property public abstract kotlin.reflect.KClass<?> entity;
-  }
-
-}
-
diff --git a/room/room-guava/api/public_plus_experimental_current.txt b/room/room-guava/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-guava/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-ktx/api/public_plus_experimental_current.txt b/room/room-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 666ad72..0000000
--- a/room/room-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Signature format: 4.0
-package androidx.room {
-
-  public final class RoomDatabaseKt {
-    method public static kotlinx.coroutines.flow.Flow<java.util.Set<java.lang.String>> invalidationTrackerFlow(androidx.room.RoomDatabase, String![] tables, optional boolean emitInitialState);
-    method public static suspend <R> Object? withTransaction(androidx.room.RoomDatabase, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super R>,?> block, kotlin.coroutines.Continuation<? super R>);
-  }
-
-}
-
-package androidx.room.migration {
-
-  public final class MigrationKt {
-    method public static androidx.room.migration.Migration Migration(int startVersion, int endVersion, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,kotlin.Unit> migrate);
-  }
-
-}
-
diff --git a/room/room-migration/api/public_plus_experimental_current.txt b/room/room-migration/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-migration/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-paging-guava/api/public_plus_experimental_current.txt b/room/room-paging-guava/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-paging-guava/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-paging-rxjava2/api/public_plus_experimental_current.txt b/room/room-paging-rxjava2/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-paging-rxjava2/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-paging-rxjava3/api/public_plus_experimental_current.txt b/room/room-paging-rxjava3/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-paging-rxjava3/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-paging/api/public_plus_experimental_current.txt b/room/room-paging/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/room/room-paging/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/room/room-runtime/api/current.txt b/room/room-runtime/api/current.txt
index 7a3725f..85a503e 100644
--- a/room/room-runtime/api/current.txt
+++ b/room/room-runtime/api/current.txt
@@ -24,6 +24,9 @@
     field public final java.util.List<java.lang.Object> typeConverters;
   }
 
+  @RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalRoomApi {
+  }
+
   public class InvalidationTracker {
     method @WorkerThread public void addObserver(androidx.room.InvalidationTracker.Observer observer);
     method public void refreshVersionsAsync();
@@ -40,6 +43,11 @@
     method public abstract void onInvalidated(java.util.Set<java.lang.String> tables);
   }
 
+  @androidx.room.ExperimentalRoomApi public final class MultiInstanceInvalidationService extends android.app.Service {
+    ctor public MultiInstanceInvalidationService();
+    method public android.os.IBinder onBind(android.content.Intent intent);
+  }
+
   public final class Room {
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> databaseBuilder(android.content.Context context, Class<T> klass, String? name);
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, Class<T> klass);
@@ -98,7 +106,9 @@
     method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationFrom(int... startVersions);
     method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationOnDowngrade();
     method public androidx.room.RoomDatabase.Builder<T> openHelperFactory(androidx.sqlite.db.SupportSQLiteOpenHelper.Factory? factory);
+    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setAutoCloseTimeout(@IntRange(from=0L) long autoCloseTimeout, java.util.concurrent.TimeUnit autoCloseTimeUnit);
     method public androidx.room.RoomDatabase.Builder<T> setJournalMode(androidx.room.RoomDatabase.JournalMode journalMode);
+    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setMultiInstanceInvalidationServiceIntent(android.content.Intent invalidationServiceIntent);
     method public androidx.room.RoomDatabase.Builder<T> setQueryCallback(androidx.room.RoomDatabase.QueryCallback queryCallback, java.util.concurrent.Executor executor);
     method public androidx.room.RoomDatabase.Builder<T> setQueryExecutor(java.util.concurrent.Executor executor);
     method public androidx.room.RoomDatabase.Builder<T> setTransactionExecutor(java.util.concurrent.Executor executor);
diff --git a/room/room-runtime/api/public_plus_experimental_current.txt b/room/room-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index 85a503e..0000000
--- a/room/room-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-// Signature format: 4.0
-package androidx.room {
-
-  public class DatabaseConfiguration {
-    method public boolean isMigrationRequired(int fromVersion, int toVersion);
-    method @Deprecated public boolean isMigrationRequiredFrom(int version);
-    field public final boolean allowDestructiveMigrationOnDowngrade;
-    field public final boolean allowMainThreadQueries;
-    field public final java.util.List<androidx.room.migration.AutoMigrationSpec> autoMigrationSpecs;
-    field public final java.util.List<androidx.room.RoomDatabase.Callback>? callbacks;
-    field public final android.content.Context context;
-    field public final String? copyFromAssetPath;
-    field public final java.io.File? copyFromFile;
-    field public final java.util.concurrent.Callable<java.io.InputStream>? copyFromInputStream;
-    field public final androidx.room.RoomDatabase.JournalMode journalMode;
-    field public final androidx.room.RoomDatabase.MigrationContainer migrationContainer;
-    field public final boolean multiInstanceInvalidation;
-    field public final String? name;
-    field public final androidx.room.RoomDatabase.PrepackagedDatabaseCallback? prepackagedDatabaseCallback;
-    field public final java.util.concurrent.Executor queryExecutor;
-    field public final boolean requireMigration;
-    field public final androidx.sqlite.db.SupportSQLiteOpenHelper.Factory sqliteOpenHelperFactory;
-    field public final java.util.concurrent.Executor transactionExecutor;
-    field public final java.util.List<java.lang.Object> typeConverters;
-  }
-
-  @RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalRoomApi {
-  }
-
-  public class InvalidationTracker {
-    method @WorkerThread public void addObserver(androidx.room.InvalidationTracker.Observer observer);
-    method public void refreshVersionsAsync();
-    method @WorkerThread public void removeObserver(androidx.room.InvalidationTracker.Observer observer);
-    field public static final androidx.room.InvalidationTracker.Companion Companion;
-  }
-
-  public static final class InvalidationTracker.Companion {
-  }
-
-  public abstract static class InvalidationTracker.Observer {
-    ctor protected InvalidationTracker.Observer(String firstTable, java.lang.String... rest);
-    ctor public InvalidationTracker.Observer(String![] tables);
-    method public abstract void onInvalidated(java.util.Set<java.lang.String> tables);
-  }
-
-  @androidx.room.ExperimentalRoomApi public final class MultiInstanceInvalidationService extends android.app.Service {
-    ctor public MultiInstanceInvalidationService();
-    method public android.os.IBinder onBind(android.content.Intent intent);
-  }
-
-  public final class Room {
-    method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> databaseBuilder(android.content.Context context, Class<T> klass, String? name);
-    method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, Class<T> klass);
-    field public static final androidx.room.Room INSTANCE;
-    field public static final String MASTER_TABLE_NAME = "room_master_table";
-  }
-
-  public abstract class RoomDatabase {
-    ctor public RoomDatabase();
-    method @Deprecated public void beginTransaction();
-    method @WorkerThread public abstract void clearAllTables();
-    method public void close();
-    method public androidx.sqlite.db.SupportSQLiteStatement compileStatement(String sql);
-    method protected abstract androidx.room.InvalidationTracker createInvalidationTracker();
-    method protected abstract androidx.sqlite.db.SupportSQLiteOpenHelper createOpenHelper(androidx.room.DatabaseConfiguration config);
-    method @Deprecated public void endTransaction();
-    method public androidx.room.InvalidationTracker getInvalidationTracker();
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper getOpenHelper();
-    method public java.util.concurrent.Executor getQueryExecutor();
-    method public java.util.concurrent.Executor getTransactionExecutor();
-    method public <T> T? getTypeConverter(Class<T> klass);
-    method public boolean inTransaction();
-    method @CallSuper public void init(androidx.room.DatabaseConfiguration configuration);
-    method protected void internalInitInvalidationTracker(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public boolean isOpen();
-    method public android.database.Cursor query(androidx.sqlite.db.SupportSQLiteQuery query);
-    method public android.database.Cursor query(androidx.sqlite.db.SupportSQLiteQuery query, optional android.os.CancellationSignal? signal);
-    method public android.database.Cursor query(String query, Object![]? args);
-    method public void runInTransaction(Runnable body);
-    method public <V> V runInTransaction(java.util.concurrent.Callable<V> body);
-    method @Deprecated public void setTransactionSuccessful();
-    property public androidx.room.InvalidationTracker invalidationTracker;
-    property public boolean isOpen;
-    property public androidx.sqlite.db.SupportSQLiteOpenHelper openHelper;
-    property public java.util.concurrent.Executor queryExecutor;
-    property public java.util.concurrent.Executor transactionExecutor;
-    field public static final androidx.room.RoomDatabase.Companion Companion;
-    field @Deprecated @kotlin.jvm.Volatile protected volatile androidx.sqlite.db.SupportSQLiteDatabase? mDatabase;
-  }
-
-  public static class RoomDatabase.Builder<T extends androidx.room.RoomDatabase> {
-    method public androidx.room.RoomDatabase.Builder<T> addAutoMigrationSpec(androidx.room.migration.AutoMigrationSpec autoMigrationSpec);
-    method public androidx.room.RoomDatabase.Builder<T> addCallback(androidx.room.RoomDatabase.Callback callback);
-    method public androidx.room.RoomDatabase.Builder<T> addMigrations(androidx.room.migration.Migration... migrations);
-    method public androidx.room.RoomDatabase.Builder<T> addTypeConverter(Object typeConverter);
-    method public androidx.room.RoomDatabase.Builder<T> allowMainThreadQueries();
-    method public T build();
-    method public androidx.room.RoomDatabase.Builder<T> createFromAsset(String databaseFilePath);
-    method public androidx.room.RoomDatabase.Builder<T> createFromAsset(String databaseFilePath, androidx.room.RoomDatabase.PrepackagedDatabaseCallback callback);
-    method public androidx.room.RoomDatabase.Builder<T> createFromFile(java.io.File databaseFile);
-    method public androidx.room.RoomDatabase.Builder<T> createFromFile(java.io.File databaseFile, androidx.room.RoomDatabase.PrepackagedDatabaseCallback callback);
-    method public androidx.room.RoomDatabase.Builder<T> createFromInputStream(java.util.concurrent.Callable<java.io.InputStream> inputStreamCallable);
-    method public androidx.room.RoomDatabase.Builder<T> createFromInputStream(java.util.concurrent.Callable<java.io.InputStream> inputStreamCallable, androidx.room.RoomDatabase.PrepackagedDatabaseCallback callback);
-    method public androidx.room.RoomDatabase.Builder<T> enableMultiInstanceInvalidation();
-    method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigration();
-    method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationFrom(int... startVersions);
-    method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationOnDowngrade();
-    method public androidx.room.RoomDatabase.Builder<T> openHelperFactory(androidx.sqlite.db.SupportSQLiteOpenHelper.Factory? factory);
-    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setAutoCloseTimeout(@IntRange(from=0L) long autoCloseTimeout, java.util.concurrent.TimeUnit autoCloseTimeUnit);
-    method public androidx.room.RoomDatabase.Builder<T> setJournalMode(androidx.room.RoomDatabase.JournalMode journalMode);
-    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setMultiInstanceInvalidationServiceIntent(android.content.Intent invalidationServiceIntent);
-    method public androidx.room.RoomDatabase.Builder<T> setQueryCallback(androidx.room.RoomDatabase.QueryCallback queryCallback, java.util.concurrent.Executor executor);
-    method public androidx.room.RoomDatabase.Builder<T> setQueryExecutor(java.util.concurrent.Executor executor);
-    method public androidx.room.RoomDatabase.Builder<T> setTransactionExecutor(java.util.concurrent.Executor executor);
-  }
-
-  public abstract static class RoomDatabase.Callback {
-    ctor public RoomDatabase.Callback();
-    method public void onCreate(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public void onDestructiveMigration(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase db);
-  }
-
-  public static final class RoomDatabase.Companion {
-  }
-
-  public enum RoomDatabase.JournalMode {
-    method public static androidx.room.RoomDatabase.JournalMode valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.room.RoomDatabase.JournalMode[] values();
-    enum_constant public static final androidx.room.RoomDatabase.JournalMode AUTOMATIC;
-    enum_constant public static final androidx.room.RoomDatabase.JournalMode TRUNCATE;
-    enum_constant public static final androidx.room.RoomDatabase.JournalMode WRITE_AHEAD_LOGGING;
-  }
-
-  public static class RoomDatabase.MigrationContainer {
-    ctor public RoomDatabase.MigrationContainer();
-    method public void addMigrations(androidx.room.migration.Migration... migrations);
-    method public void addMigrations(java.util.List<? extends androidx.room.migration.Migration> migrations);
-    method public final boolean contains(int startVersion, int endVersion);
-    method public java.util.List<androidx.room.migration.Migration>? findMigrationPath(int start, int end);
-    method public java.util.Map<java.lang.Integer,java.util.Map<java.lang.Integer,androidx.room.migration.Migration>> getMigrations();
-  }
-
-  public abstract static class RoomDatabase.PrepackagedDatabaseCallback {
-    ctor public RoomDatabase.PrepackagedDatabaseCallback();
-    method public void onOpenPrepackagedDatabase(androidx.sqlite.db.SupportSQLiteDatabase db);
-  }
-
-  public static interface RoomDatabase.QueryCallback {
-    method public void onQuery(String sqlQuery, java.util.List<?> bindArgs);
-  }
-
-}
-
-package androidx.room.migration {
-
-  public interface AutoMigrationSpec {
-    method public default void onPostMigrate(androidx.sqlite.db.SupportSQLiteDatabase db);
-  }
-
-  public abstract class Migration {
-    ctor public Migration(int startVersion, int endVersion);
-    method public abstract void migrate(androidx.sqlite.db.SupportSQLiteDatabase db);
-    field public final int endVersion;
-    field public final int startVersion;
-  }
-
-}
-
diff --git a/room/room-runtime/api/restricted_current.txt b/room/room-runtime/api/restricted_current.txt
index b20f71c..3c93dee 100644
--- a/room/room-runtime/api/restricted_current.txt
+++ b/room/room-runtime/api/restricted_current.txt
@@ -70,6 +70,9 @@
     method public java.util.List<java.lang.Long> upsertAndReturnIdsList(T![] entities);
   }
 
+  @RequiresOptIn @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface ExperimentalRoomApi {
+  }
+
   public class InvalidationTracker {
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public InvalidationTracker(androidx.room.RoomDatabase database, java.lang.String... tableNames);
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public InvalidationTracker(androidx.room.RoomDatabase database, java.util.Map<java.lang.String,java.lang.String> shadowTablesMap, java.util.Map<java.lang.String,java.util.Set<java.lang.String>> viewTables, java.lang.String... tableNames);
@@ -92,6 +95,11 @@
     method public abstract void onInvalidated(java.util.Set<java.lang.String> tables);
   }
 
+  @androidx.room.ExperimentalRoomApi public final class MultiInstanceInvalidationService extends android.app.Service {
+    ctor public MultiInstanceInvalidationService();
+    method public android.os.IBinder onBind(android.content.Intent intent);
+  }
+
   public final class Room {
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> databaseBuilder(android.content.Context context, Class<T> klass, String? name);
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, Class<T> klass);
@@ -153,7 +161,9 @@
     method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationFrom(int... startVersions);
     method public androidx.room.RoomDatabase.Builder<T> fallbackToDestructiveMigrationOnDowngrade();
     method public androidx.room.RoomDatabase.Builder<T> openHelperFactory(androidx.sqlite.db.SupportSQLiteOpenHelper.Factory? factory);
+    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setAutoCloseTimeout(@IntRange(from=0L) long autoCloseTimeout, java.util.concurrent.TimeUnit autoCloseTimeUnit);
     method public androidx.room.RoomDatabase.Builder<T> setJournalMode(androidx.room.RoomDatabase.JournalMode journalMode);
+    method @androidx.room.ExperimentalRoomApi public androidx.room.RoomDatabase.Builder<T> setMultiInstanceInvalidationServiceIntent(android.content.Intent invalidationServiceIntent);
     method public androidx.room.RoomDatabase.Builder<T> setQueryCallback(androidx.room.RoomDatabase.QueryCallback queryCallback, java.util.concurrent.Executor executor);
     method public androidx.room.RoomDatabase.Builder<T> setQueryExecutor(java.util.concurrent.Executor executor);
     method public androidx.room.RoomDatabase.Builder<T> setTransactionExecutor(java.util.concurrent.Executor executor);
diff --git a/room/room-rxjava2/api/public_plus_experimental_current.txt b/room/room-rxjava2/api/public_plus_experimental_current.txt
deleted file mode 100644
index 64b6fe4..0000000
--- a/room/room-rxjava2/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Signature format: 4.0
-package androidx.room {
-
-  public class EmptyResultSetException extends java.lang.RuntimeException {
-    ctor public EmptyResultSetException(String!);
-  }
-
-  public class RxRoom {
-    ctor @Deprecated public RxRoom();
-    method public static io.reactivex.Flowable<java.lang.Object!>! createFlowable(androidx.room.RoomDatabase!, java.lang.String!...);
-    method public static io.reactivex.Observable<java.lang.Object!>! createObservable(androidx.room.RoomDatabase!, java.lang.String!...);
-    field public static final Object! NOTHING;
-  }
-
-}
-
diff --git a/room/room-rxjava3/api/public_plus_experimental_current.txt b/room/room-rxjava3/api/public_plus_experimental_current.txt
deleted file mode 100644
index 6b78281..0000000
--- a/room/room-rxjava3/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Signature format: 4.0
-package androidx.room.rxjava3 {
-
-  public final class EmptyResultSetException extends java.lang.RuntimeException {
-    ctor public EmptyResultSetException(String);
-  }
-
-  public final class RxRoom {
-    method public static io.reactivex.rxjava3.core.Flowable<java.lang.Object!> createFlowable(androidx.room.RoomDatabase, java.lang.String!...);
-    method public static io.reactivex.rxjava3.core.Observable<java.lang.Object!> createObservable(androidx.room.RoomDatabase, java.lang.String!...);
-    field public static final Object NOTHING;
-  }
-
-}
-
diff --git a/room/room-testing/api/public_plus_experimental_current.txt b/room/room-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index 482f988..0000000
--- a/room/room-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Signature format: 4.0
-package androidx.room.testing {
-
-  public class MigrationTestHelper extends org.junit.rules.TestWatcher {
-    ctor public MigrationTestHelper(android.app.Instrumentation instrumentation, Class<? extends androidx.room.RoomDatabase> databaseClass);
-    ctor public MigrationTestHelper(android.app.Instrumentation instrumentation, Class<? extends androidx.room.RoomDatabase> databaseClass, java.util.List<? extends androidx.room.migration.AutoMigrationSpec> specs);
-    ctor public MigrationTestHelper(android.app.Instrumentation instrumentation, Class<? extends androidx.room.RoomDatabase> databaseClass, java.util.List<? extends androidx.room.migration.AutoMigrationSpec> specs, optional androidx.sqlite.db.SupportSQLiteOpenHelper.Factory openFactory);
-    ctor @Deprecated public MigrationTestHelper(android.app.Instrumentation instrumentation, String assetsFolder);
-    ctor @Deprecated public MigrationTestHelper(android.app.Instrumentation instrumentation, String assetsFolder, optional androidx.sqlite.db.SupportSQLiteOpenHelper.Factory openFactory);
-    method public void closeWhenFinished(androidx.room.RoomDatabase db);
-    method public void closeWhenFinished(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public androidx.sqlite.db.SupportSQLiteDatabase createDatabase(String name, int version) throws java.io.IOException;
-    method public androidx.sqlite.db.SupportSQLiteDatabase runMigrationsAndValidate(String name, int version, boolean validateDroppedTables, androidx.room.migration.Migration... migrations);
-  }
-
-}
-
diff --git a/savedstate/savedstate-ktx/api/public_plus_experimental_current.txt b/savedstate/savedstate-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 4d70c58..0000000
--- a/savedstate/savedstate-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.savedstate {
-
-  public final class ViewKt {
-    method @Deprecated public static androidx.savedstate.SavedStateRegistryOwner? findViewTreeSavedStateRegistryOwner(android.view.View);
-  }
-
-}
-
diff --git a/savedstate/savedstate/api/public_plus_experimental_current.txt b/savedstate/savedstate/api/public_plus_experimental_current.txt
deleted file mode 100644
index 6fe1a0d..0000000
--- a/savedstate/savedstate/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Signature format: 4.0
-package androidx.savedstate {
-
-  public final class SavedStateRegistry {
-    method @MainThread public android.os.Bundle? consumeRestoredStateForKey(String key);
-    method public androidx.savedstate.SavedStateRegistry.SavedStateProvider? getSavedStateProvider(String key);
-    method @MainThread public boolean isRestored();
-    method @MainThread public void registerSavedStateProvider(String key, androidx.savedstate.SavedStateRegistry.SavedStateProvider provider);
-    method @MainThread public void runOnNextRecreation(Class<? extends androidx.savedstate.SavedStateRegistry.AutoRecreated> clazz);
-    method @MainThread public void unregisterSavedStateProvider(String key);
-    property @MainThread public final boolean isRestored;
-  }
-
-  public static interface SavedStateRegistry.AutoRecreated {
-    method public void onRecreated(androidx.savedstate.SavedStateRegistryOwner owner);
-  }
-
-  public static fun interface SavedStateRegistry.SavedStateProvider {
-    method public android.os.Bundle saveState();
-  }
-
-  public final class SavedStateRegistryController {
-    method public static androidx.savedstate.SavedStateRegistryController create(androidx.savedstate.SavedStateRegistryOwner owner);
-    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
-    method @MainThread public void performAttach();
-    method @MainThread public void performRestore(android.os.Bundle? savedState);
-    method @MainThread public void performSave(android.os.Bundle outBundle);
-    property public final androidx.savedstate.SavedStateRegistry savedStateRegistry;
-    field public static final androidx.savedstate.SavedStateRegistryController.Companion Companion;
-  }
-
-  public static final class SavedStateRegistryController.Companion {
-    method public androidx.savedstate.SavedStateRegistryController create(androidx.savedstate.SavedStateRegistryOwner owner);
-  }
-
-  public interface SavedStateRegistryOwner extends androidx.lifecycle.LifecycleOwner {
-    method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
-    property public abstract androidx.savedstate.SavedStateRegistry savedStateRegistry;
-  }
-
-  public final class ViewTreeSavedStateRegistryOwner {
-    method public static androidx.savedstate.SavedStateRegistryOwner? get(android.view.View);
-    method public static void set(android.view.View, androidx.savedstate.SavedStateRegistryOwner? owner);
-  }
-
-}
-
diff --git a/security/security-app-authenticator-testing/api/public_plus_experimental_current.txt b/security/security-app-authenticator-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9e8fd21..0000000
--- a/security/security-app-authenticator-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Signature format: 4.0
-package androidx.security.app.authenticator {
-
-  public final class TestAppAuthenticatorBuilder {
-    method public androidx.security.app.authenticator.AppAuthenticator build() throws androidx.security.app.authenticator.AppAuthenticatorXmlException, java.io.IOException;
-    method public static androidx.security.app.authenticator.TestAppAuthenticatorBuilder createFromInputStream(android.content.Context, java.io.InputStream) throws androidx.security.app.authenticator.AppAuthenticatorXmlException;
-    method public static androidx.security.app.authenticator.TestAppAuthenticatorBuilder createFromResource(android.content.Context, @XmlRes int);
-    method public androidx.security.app.authenticator.TestAppAuthenticatorBuilder setPackageNotInstalled(String);
-    method public androidx.security.app.authenticator.TestAppAuthenticatorBuilder setSignatureAcceptedForPackage(String);
-    method public androidx.security.app.authenticator.TestAppAuthenticatorBuilder setSigningIdentityForPackage(String, String);
-    method public androidx.security.app.authenticator.TestAppAuthenticatorBuilder setTestPolicy(int);
-    method public androidx.security.app.authenticator.TestAppAuthenticatorBuilder setUidForPackage(String, int);
-    field public static final int POLICY_CUSTOM = 3; // 0x3
-    field public static final int POLICY_DENY_ALL = 2; // 0x2
-    field public static final int POLICY_SIGNATURE_ACCEPTED_FOR_DECLARED_PACKAGES = 1; // 0x1
-  }
-
-}
-
diff --git a/security/security-app-authenticator/api/public_plus_experimental_current.txt b/security/security-app-authenticator/api/public_plus_experimental_current.txt
deleted file mode 100644
index adb40b6..0000000
--- a/security/security-app-authenticator/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Signature format: 4.0
-package androidx.security.app.authenticator {
-
-  public class AppAuthenticator {
-    method public int checkAppIdentity(String);
-    method public int checkCallingAppIdentity(String, String);
-    method public int checkCallingAppIdentity(String, String, int, int);
-    method public static androidx.security.app.authenticator.AppAuthenticator createFromInputStream(android.content.Context, java.io.InputStream) throws androidx.security.app.authenticator.AppAuthenticatorXmlException, java.io.IOException;
-    method public static androidx.security.app.authenticator.AppAuthenticator createFromResource(android.content.Context, @XmlRes int) throws androidx.security.app.authenticator.AppAuthenticatorXmlException, java.io.IOException;
-    method public void enforceAppIdentity(String);
-    method public void enforceCallingAppIdentity(String, String);
-    method public void enforceCallingAppIdentity(String, String, int, int);
-    field public static final int PERMISSION_DENIED_NO_MATCH = -3; // 0xfffffffd
-    field public static final int PERMISSION_DENIED_PACKAGE_UID_MISMATCH = -5; // 0xfffffffb
-    field public static final int PERMISSION_DENIED_UNKNOWN_PACKAGE = -4; // 0xfffffffc
-    field public static final int PERMISSION_GRANTED = 0; // 0x0
-    field public static final int SIGNATURE_MATCH = 0; // 0x0
-    field public static final int SIGNATURE_NO_MATCH = -1; // 0xffffffff
-  }
-
-  public class AppAuthenticatorXmlException extends java.lang.Exception {
-  }
-
-}
-
diff --git a/security/security-biometric/api/public_plus_experimental_current.txt b/security/security-biometric/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/security/security-biometric/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/security/security-crypto-ktx/api/public_plus_experimental_current.txt b/security/security-crypto-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e532c81..0000000
--- a/security/security-crypto-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Signature format: 4.0
-package androidx.security.crypto {
-
-  public final class EncryptedFileKt {
-    method public static androidx.security.crypto.EncryptedFile EncryptedFile(android.content.Context context, java.io.File file, androidx.security.crypto.MasterKey masterKey, optional androidx.security.crypto.EncryptedFile.FileEncryptionScheme fileEncryptionScheme, optional String? keysetPrefName, optional String? keysetAlias);
-  }
-
-  public final class EncryptedSharedPreferencesKt {
-    method public static android.content.SharedPreferences EncryptedSharedPreferences(android.content.Context context, String fileName, androidx.security.crypto.MasterKey masterKey, optional androidx.security.crypto.EncryptedSharedPreferences.PrefKeyEncryptionScheme prefKeyEncryptionScheme, optional androidx.security.crypto.EncryptedSharedPreferences.PrefValueEncryptionScheme prefValueEncryptionScheme);
-  }
-
-  public final class MasterKeyKt {
-    method public static androidx.security.crypto.MasterKey MasterKey(android.content.Context context, optional String keyAlias, optional androidx.security.crypto.MasterKey.KeyScheme keyScheme, optional boolean authenticationRequired, optional int userAuthenticationValidityDurationSeconds, optional boolean requestStrongBoxBacked);
-  }
-
-}
-
diff --git a/security/security-crypto/api/public_plus_experimental_current.txt b/security/security-crypto/api/public_plus_experimental_current.txt
deleted file mode 100644
index 8e8b71a..0000000
--- a/security/security-crypto/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Signature format: 4.0
-package androidx.security.crypto {
-
-  public final class EncryptedFile {
-    method public java.io.FileInputStream openFileInput() throws java.io.FileNotFoundException, java.security.GeneralSecurityException, java.io.IOException;
-    method public java.io.FileOutputStream openFileOutput() throws java.security.GeneralSecurityException, java.io.IOException;
-  }
-
-  public static final class EncryptedFile.Builder {
-    ctor public EncryptedFile.Builder(android.content.Context, java.io.File, androidx.security.crypto.MasterKey, androidx.security.crypto.EncryptedFile.FileEncryptionScheme);
-    ctor @Deprecated public EncryptedFile.Builder(java.io.File, android.content.Context, String, androidx.security.crypto.EncryptedFile.FileEncryptionScheme);
-    method public androidx.security.crypto.EncryptedFile build() throws java.security.GeneralSecurityException, java.io.IOException;
-    method public androidx.security.crypto.EncryptedFile.Builder setKeysetAlias(String);
-    method public androidx.security.crypto.EncryptedFile.Builder setKeysetPrefName(String);
-  }
-
-  public enum EncryptedFile.FileEncryptionScheme {
-    enum_constant public static final androidx.security.crypto.EncryptedFile.FileEncryptionScheme AES256_GCM_HKDF_4KB;
-  }
-
-  public final class EncryptedSharedPreferences implements android.content.SharedPreferences {
-    method public boolean contains(String?);
-    method public static android.content.SharedPreferences create(android.content.Context, String, androidx.security.crypto.MasterKey, androidx.security.crypto.EncryptedSharedPreferences.PrefKeyEncryptionScheme, androidx.security.crypto.EncryptedSharedPreferences.PrefValueEncryptionScheme) throws java.security.GeneralSecurityException, java.io.IOException;
-    method @Deprecated public static android.content.SharedPreferences create(String, String, android.content.Context, androidx.security.crypto.EncryptedSharedPreferences.PrefKeyEncryptionScheme, androidx.security.crypto.EncryptedSharedPreferences.PrefValueEncryptionScheme) throws java.security.GeneralSecurityException, java.io.IOException;
-    method public android.content.SharedPreferences.Editor edit();
-    method public java.util.Map<java.lang.String!,?> getAll();
-    method public boolean getBoolean(String?, boolean);
-    method public float getFloat(String?, float);
-    method public int getInt(String?, int);
-    method public long getLong(String?, long);
-    method public String? getString(String?, String?);
-    method public java.util.Set<java.lang.String!>? getStringSet(String?, java.util.Set<java.lang.String!>?);
-    method public void registerOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener);
-    method public void unregisterOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener);
-  }
-
-  public enum EncryptedSharedPreferences.PrefKeyEncryptionScheme {
-    enum_constant public static final androidx.security.crypto.EncryptedSharedPreferences.PrefKeyEncryptionScheme AES256_SIV;
-  }
-
-  public enum EncryptedSharedPreferences.PrefValueEncryptionScheme {
-    enum_constant public static final androidx.security.crypto.EncryptedSharedPreferences.PrefValueEncryptionScheme AES256_GCM;
-  }
-
-  public final class MasterKey {
-    method public static int getDefaultAuthenticationValidityDurationSeconds();
-    method public int getUserAuthenticationValidityDurationSeconds();
-    method public boolean isKeyStoreBacked();
-    method public boolean isStrongBoxBacked();
-    method public boolean isUserAuthenticationRequired();
-    field public static final int DEFAULT_AES_GCM_MASTER_KEY_SIZE = 256; // 0x100
-    field public static final String DEFAULT_MASTER_KEY_ALIAS = "_androidx_security_master_key_";
-  }
-
-  public static final class MasterKey.Builder {
-    ctor public MasterKey.Builder(android.content.Context);
-    ctor public MasterKey.Builder(android.content.Context, String);
-    method public androidx.security.crypto.MasterKey build() throws java.security.GeneralSecurityException, java.io.IOException;
-    method @RequiresApi(android.os.Build.VERSION_CODES.M) public androidx.security.crypto.MasterKey.Builder setKeyGenParameterSpec(android.security.keystore.KeyGenParameterSpec);
-    method public androidx.security.crypto.MasterKey.Builder setKeyScheme(androidx.security.crypto.MasterKey.KeyScheme);
-    method public androidx.security.crypto.MasterKey.Builder setRequestStrongBoxBacked(boolean);
-    method public androidx.security.crypto.MasterKey.Builder setUserAuthenticationRequired(boolean);
-    method public androidx.security.crypto.MasterKey.Builder setUserAuthenticationRequired(boolean, @IntRange(from=1) int);
-  }
-
-  public enum MasterKey.KeyScheme {
-    enum_constant public static final androidx.security.crypto.MasterKey.KeyScheme AES256_GCM;
-  }
-
-  @Deprecated @RequiresApi(android.os.Build.VERSION_CODES.M) public final class MasterKeys {
-    method @Deprecated public static String getOrCreate(android.security.keystore.KeyGenParameterSpec) throws java.security.GeneralSecurityException, java.io.IOException;
-    field @Deprecated public static final android.security.keystore.KeyGenParameterSpec AES256_GCM_SPEC;
-  }
-
-}
-
diff --git a/security/security-identity-credential/api/public_plus_experimental_current.txt b/security/security-identity-credential/api/public_plus_experimental_current.txt
deleted file mode 100644
index 1bae701..0000000
--- a/security/security-identity-credential/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-// Signature format: 4.0
-package androidx.security.identity {
-
-  public class AccessControlProfile {
-  }
-
-  public static final class AccessControlProfile.Builder {
-    ctor public AccessControlProfile.Builder(androidx.security.identity.AccessControlProfileId);
-    method public androidx.security.identity.AccessControlProfile build();
-    method public androidx.security.identity.AccessControlProfile.Builder setReaderCertificate(java.security.cert.X509Certificate);
-    method public androidx.security.identity.AccessControlProfile.Builder setUserAuthenticationRequired(boolean);
-    method public androidx.security.identity.AccessControlProfile.Builder setUserAuthenticationTimeout(long);
-  }
-
-  public class AccessControlProfileId {
-    ctor public AccessControlProfileId(int);
-    method public int getId();
-  }
-
-  public class AlreadyPersonalizedException extends androidx.security.identity.IdentityCredentialException {
-    ctor public AlreadyPersonalizedException(String);
-    ctor public AlreadyPersonalizedException(String, Throwable);
-  }
-
-  public class CipherSuiteNotSupportedException extends androidx.security.identity.IdentityCredentialException {
-    ctor public CipherSuiteNotSupportedException(String);
-    ctor public CipherSuiteNotSupportedException(String, Throwable);
-  }
-
-  public class DocTypeNotSupportedException extends androidx.security.identity.IdentityCredentialException {
-    ctor public DocTypeNotSupportedException(String);
-    ctor public DocTypeNotSupportedException(String, Throwable);
-  }
-
-  public class EphemeralPublicKeyNotFoundException extends androidx.security.identity.IdentityCredentialException {
-    ctor public EphemeralPublicKeyNotFoundException(String);
-    ctor public EphemeralPublicKeyNotFoundException(String, Throwable);
-  }
-
-  public abstract class IdentityCredential {
-    method public abstract java.security.KeyPair createEphemeralKeyPair();
-    method public abstract byte[] decryptMessageFromReader(byte[]) throws androidx.security.identity.MessageDecryptionException;
-    method public byte[] delete(byte[]);
-    method public abstract byte[] encryptMessageToReader(byte[]);
-    method public abstract java.util.Collection<java.security.cert.X509Certificate!> getAuthKeysNeedingCertification();
-    method public abstract int[] getAuthenticationDataUsageCount();
-    method public abstract java.util.Collection<java.security.cert.X509Certificate!> getCredentialKeyCertificateChain();
-    method public abstract androidx.biometric.BiometricPrompt.CryptoObject? getCryptoObject();
-    method public abstract androidx.security.identity.ResultData getEntries(byte[]?, java.util.Map<java.lang.String!,java.util.Collection<java.lang.String!>!>, byte[]?) throws androidx.security.identity.EphemeralPublicKeyNotFoundException, androidx.security.identity.InvalidReaderSignatureException, androidx.security.identity.InvalidRequestMessageException, androidx.security.identity.NoAuthenticationKeyAvailableException;
-    method public byte[] proveOwnership(byte[]);
-    method public abstract void setAllowUsingExhaustedKeys(boolean);
-    method public void setAllowUsingExpiredKeys(boolean);
-    method public abstract void setAvailableAuthenticationKeys(int, int);
-    method public abstract void setReaderEphemeralPublicKey(java.security.PublicKey) throws java.security.InvalidKeyException;
-    method public abstract void setSessionTranscript(byte[]);
-    method public void storeStaticAuthenticationData(java.security.cert.X509Certificate, android.icu.util.Calendar, byte[]) throws androidx.security.identity.UnknownAuthenticationKeyException;
-    method @Deprecated public abstract void storeStaticAuthenticationData(java.security.cert.X509Certificate, byte[]) throws androidx.security.identity.UnknownAuthenticationKeyException;
-    method public byte[] update(androidx.security.identity.PersonalizationData);
-  }
-
-  public class IdentityCredentialException extends java.lang.Exception {
-    ctor public IdentityCredentialException(String);
-    ctor public IdentityCredentialException(String, Throwable);
-  }
-
-  public abstract class IdentityCredentialStore {
-    method public abstract androidx.security.identity.WritableIdentityCredential createCredential(String, String) throws androidx.security.identity.AlreadyPersonalizedException, androidx.security.identity.DocTypeNotSupportedException;
-    method @Deprecated public abstract byte[]? deleteCredentialByName(String);
-    method public androidx.security.identity.IdentityCredentialStoreCapabilities getCapabilities();
-    method public abstract androidx.security.identity.IdentityCredential? getCredentialByName(String, int) throws androidx.security.identity.CipherSuiteNotSupportedException;
-    method public static androidx.security.identity.IdentityCredentialStore getDirectAccessInstance(android.content.Context);
-    method public static androidx.security.identity.IdentityCredentialStore? getHardwareInstance(android.content.Context);
-    method public static androidx.security.identity.IdentityCredentialStore getInstance(android.content.Context);
-    method public static androidx.security.identity.IdentityCredentialStore getSoftwareInstance(android.content.Context);
-    method @Deprecated public abstract String![] getSupportedDocTypes();
-    method public static boolean isDirectAccessSupported(android.content.Context);
-    field public static final int CIPHERSUITE_ECDHE_HKDF_ECDSA_WITH_AES_256_GCM_SHA256 = 1; // 0x1
-  }
-
-  public class IdentityCredentialStoreCapabilities {
-    method public int getFeatureVersion();
-    method public java.util.Set<java.lang.String!> getSupportedDocTypes();
-    method public boolean isDeleteSupported();
-    method public boolean isDirectAccess();
-    method public boolean isHardwareBacked();
-    method public boolean isProveOwnershipSupported();
-    method public boolean isStaticAuthenticationDataExpirationSupported();
-    method public boolean isUpdateSupported();
-    field public static final int FEATURE_VERSION_202009 = 202009; // 0x31519
-    field public static final int FEATURE_VERSION_202101 = 202101; // 0x31575
-  }
-
-  public class InvalidReaderSignatureException extends androidx.security.identity.IdentityCredentialException {
-    ctor public InvalidReaderSignatureException(String);
-    ctor public InvalidReaderSignatureException(String, Throwable);
-  }
-
-  public class InvalidRequestMessageException extends androidx.security.identity.IdentityCredentialException {
-    ctor public InvalidRequestMessageException(String);
-    ctor public InvalidRequestMessageException(String, Throwable);
-  }
-
-  public class MessageDecryptionException extends androidx.security.identity.IdentityCredentialException {
-    ctor public MessageDecryptionException(String);
-    ctor public MessageDecryptionException(String, Throwable);
-  }
-
-  public class NoAuthenticationKeyAvailableException extends androidx.security.identity.IdentityCredentialException {
-    ctor public NoAuthenticationKeyAvailableException(String);
-    ctor public NoAuthenticationKeyAvailableException(String, Throwable);
-  }
-
-  public class PersonalizationData {
-  }
-
-  public static final class PersonalizationData.Builder {
-    ctor public PersonalizationData.Builder();
-    method public androidx.security.identity.PersonalizationData.Builder addAccessControlProfile(androidx.security.identity.AccessControlProfile);
-    method public androidx.security.identity.PersonalizationData build();
-    method public androidx.security.identity.PersonalizationData.Builder putEntry(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, byte[]);
-    method public androidx.security.identity.PersonalizationData.Builder putEntryBoolean(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, boolean);
-    method public androidx.security.identity.PersonalizationData.Builder putEntryBytestring(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, byte[]);
-    method public androidx.security.identity.PersonalizationData.Builder putEntryCalendar(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, android.icu.util.Calendar);
-    method public androidx.security.identity.PersonalizationData.Builder putEntryInteger(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, long);
-    method public androidx.security.identity.PersonalizationData.Builder putEntryString(String, String, java.util.Collection<androidx.security.identity.AccessControlProfileId!>, String);
-  }
-
-  public abstract class ResultData {
-    method public abstract byte[] getAuthenticatedData();
-    method public abstract byte[]? getEcdsaSignature();
-    method public abstract byte[]? getEntry(String, String);
-    method public boolean getEntryBoolean(String, String);
-    method public byte[]? getEntryBytestring(String, String);
-    method public android.icu.util.Calendar? getEntryCalendar(String, String);
-    method public long getEntryInteger(String, String);
-    method public abstract java.util.Collection<java.lang.String!>? getEntryNames(String);
-    method public String? getEntryString(String, String);
-    method public abstract byte[]? getMessageAuthenticationCode();
-    method public abstract java.util.Collection<java.lang.String!> getNamespaces();
-    method public abstract java.util.Collection<java.lang.String!>? getRetrievedEntryNames(String);
-    method public abstract byte[] getStaticAuthenticationData();
-    method public abstract int getStatus(String, String);
-    field public static final int STATUS_NOT_IN_REQUEST_MESSAGE = 3; // 0x3
-    field public static final int STATUS_NOT_REQUESTED = 2; // 0x2
-    field public static final int STATUS_NO_ACCESS_CONTROL_PROFILES = 6; // 0x6
-    field public static final int STATUS_NO_SUCH_ENTRY = 1; // 0x1
-    field public static final int STATUS_OK = 0; // 0x0
-    field public static final int STATUS_READER_AUTHENTICATION_FAILED = 5; // 0x5
-    field public static final int STATUS_USER_AUTHENTICATION_FAILED = 4; // 0x4
-  }
-
-  public class UnknownAuthenticationKeyException extends androidx.security.identity.IdentityCredentialException {
-    ctor public UnknownAuthenticationKeyException(String);
-    ctor public UnknownAuthenticationKeyException(String, Throwable);
-  }
-
-  public abstract class WritableIdentityCredential {
-    method public abstract java.util.Collection<java.security.cert.X509Certificate!> getCredentialKeyCertificateChain(byte[]);
-    method public abstract byte[] personalize(androidx.security.identity.PersonalizationData);
-  }
-
-}
-
diff --git a/sharetarget/sharetarget/api/public_plus_experimental_current.txt b/sharetarget/sharetarget/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/sharetarget/sharetarget/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/slice/slice-builders-ktx/api/public_plus_experimental_current.txt b/slice/slice-builders-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 05623ec..0000000
--- a/slice/slice-builders-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-// Signature format: 4.0
-package androidx.slice.builders {
-
-  public final class CellBuilderDsl extends androidx.slice.builders.GridRowBuilder.CellBuilder {
-    ctor public CellBuilderDsl();
-  }
-
-  public final class GridRowBuilderDsl extends androidx.slice.builders.GridRowBuilder {
-    ctor public GridRowBuilderDsl();
-  }
-
-  public final class GridRowBuilderKt {
-    method public static inline androidx.slice.builders.GridRowBuilder cell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
-    method public static inline androidx.slice.builders.GridRowBuilder seeMoreCell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
-  }
-
-  public final class HeaderBuilderDsl extends androidx.slice.builders.ListBuilder.HeaderBuilder {
-    ctor public HeaderBuilderDsl();
-  }
-
-  public final class InputRangeBuilderDsl extends androidx.slice.builders.ListBuilder.InputRangeBuilder {
-    ctor public InputRangeBuilderDsl();
-  }
-
-  public final class ListBuilderDsl extends androidx.slice.builders.ListBuilder {
-    ctor public ListBuilderDsl(android.content.Context context, android.net.Uri uri, long ttl);
-  }
-
-  public final class ListBuilderKt {
-    method public static inline androidx.slice.builders.ListBuilder gridRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.GridRowBuilderDsl,kotlin.Unit> buildGrid);
-    method public static inline androidx.slice.builders.ListBuilder header(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.HeaderBuilderDsl,kotlin.Unit> buildHeader);
-    method public static inline androidx.slice.builders.ListBuilder inputRange(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.InputRangeBuilderDsl,kotlin.Unit> buildInputRange);
-    method public static inline androidx.slice.Slice list(android.content.Context context, android.net.Uri uri, long ttl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.ListBuilderDsl,kotlin.Unit> addRows);
-    method public static inline androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
-    method public static inline androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
-    method public static inline androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
-    method public static androidx.slice.builders.SliceAction tapSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat icon, optional int imageMode, CharSequence title);
-    method public static androidx.slice.builders.SliceAction toggleSliceAction(android.app.PendingIntent pendingIntent, optional androidx.core.graphics.drawable.IconCompat? icon, CharSequence title, boolean isChecked);
-  }
-
-  public final class RangeBuilderDsl extends androidx.slice.builders.ListBuilder.RangeBuilder {
-    ctor public RangeBuilderDsl();
-  }
-
-  public final class RowBuilderDsl extends androidx.slice.builders.ListBuilder.RowBuilder {
-    ctor public RowBuilderDsl();
-  }
-
-}
-
diff --git a/slice/slice-builders/api/public_plus_experimental_current.txt b/slice/slice-builders/api/public_plus_experimental_current.txt
deleted file mode 100644
index 1351608..0000000
--- a/slice/slice-builders/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-// Signature format: 4.0
-package androidx.slice.builders {
-
-  @RequiresApi(19) public class GridRowBuilder {
-    ctor public GridRowBuilder();
-    method public androidx.slice.builders.GridRowBuilder addCell(androidx.slice.builders.GridRowBuilder.CellBuilder);
-    method public androidx.slice.builders.GridRowBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.GridRowBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.GridRowBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.GridRowBuilder setSeeMoreAction(android.app.PendingIntent);
-    method public androidx.slice.builders.GridRowBuilder setSeeMoreAction(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.GridRowBuilder setSeeMoreCell(androidx.slice.builders.GridRowBuilder.CellBuilder);
-  }
-
-  public static class GridRowBuilder.CellBuilder {
-    ctor public GridRowBuilder.CellBuilder();
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addImage(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addImage(androidx.core.graphics.drawable.IconCompat?, int, boolean);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addOverlayText(CharSequence);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addOverlayText(CharSequence?, boolean);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addText(CharSequence);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addText(CharSequence?, boolean);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addTitleText(CharSequence);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder addTitleText(CharSequence?, boolean);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder setContentIntent(android.app.PendingIntent);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder setContentIntent(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.GridRowBuilder.CellBuilder setSliceAction(androidx.slice.builders.SliceAction);
-  }
-
-  @RequiresApi(19) public class ListBuilder extends androidx.slice.builders.TemplateSliceBuilder {
-    ctor @RequiresApi(26) public ListBuilder(android.content.Context, android.net.Uri, java.time.Duration?);
-    ctor public ListBuilder(android.content.Context, android.net.Uri, long);
-    method public androidx.slice.builders.ListBuilder addAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder addGridRow(androidx.slice.builders.GridRowBuilder);
-    method public androidx.slice.builders.ListBuilder addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder);
-    method public androidx.slice.builders.ListBuilder addRange(androidx.slice.builders.ListBuilder.RangeBuilder);
-    method public androidx.slice.builders.ListBuilder addRating(androidx.slice.builders.ListBuilder.RatingBuilder);
-    method public androidx.slice.builders.ListBuilder addRow(androidx.slice.builders.ListBuilder.RowBuilder);
-    method public androidx.slice.builders.ListBuilder addSelection(androidx.slice.builders.SelectionBuilder);
-    method public androidx.slice.builders.ListBuilder setAccentColor(@ColorInt int);
-    method public androidx.slice.builders.ListBuilder setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder);
-    method @RequiresApi(21) public androidx.slice.builders.ListBuilder setHostExtras(android.os.PersistableBundle);
-    method public androidx.slice.builders.ListBuilder setIsError(boolean);
-    method public androidx.slice.builders.ListBuilder setKeywords(java.util.Set<java.lang.String!>);
-    method public androidx.slice.builders.ListBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.ListBuilder setSeeMoreAction(android.app.PendingIntent);
-    method public androidx.slice.builders.ListBuilder setSeeMoreAction(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.ListBuilder setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder);
-    field public static final int ACTION_WITH_LABEL = 6; // 0x6
-    field public static final int ICON_IMAGE = 0; // 0x0
-    field public static final long INFINITY = -1L; // 0xffffffffffffffffL
-    field public static final int LARGE_IMAGE = 2; // 0x2
-    field public static final int RANGE_MODE_DETERMINATE = 0; // 0x0
-    field public static final int RANGE_MODE_INDETERMINATE = 1; // 0x1
-    field public static final int RANGE_MODE_STAR_RATING = 2; // 0x2
-    field public static final int RAW_IMAGE_LARGE = 4; // 0x4
-    field public static final int RAW_IMAGE_SMALL = 3; // 0x3
-    field public static final int SMALL_IMAGE = 1; // 0x1
-    field public static final int UNKNOWN_IMAGE = 5; // 0x5
-  }
-
-  public static class ListBuilder.HeaderBuilder {
-    ctor public ListBuilder.HeaderBuilder();
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setSubtitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setSubtitle(CharSequence, boolean);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setSummary(CharSequence);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setSummary(CharSequence, boolean);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setTitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.HeaderBuilder setTitle(CharSequence, boolean);
-  }
-
-  public static class ListBuilder.InputRangeBuilder {
-    ctor public ListBuilder.InputRangeBuilder();
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder addEndItem(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder addEndItem(androidx.slice.builders.SliceAction, boolean);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setInputAction(android.app.PendingIntent);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setInputAction(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMax(int);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setMin(int);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setSubtitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setThumb(androidx.core.graphics.drawable.IconCompat);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setTitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int, boolean);
-    method public androidx.slice.builders.ListBuilder.InputRangeBuilder setValue(int);
-  }
-
-  public static class ListBuilder.RangeBuilder {
-    ctor public ListBuilder.RangeBuilder();
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setMax(int);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setMode(int);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setSubtitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setTitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int, boolean);
-    method public androidx.slice.builders.ListBuilder.RangeBuilder setValue(int);
-  }
-
-  public static final class ListBuilder.RatingBuilder {
-    ctor public ListBuilder.RatingBuilder();
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setInputAction(android.app.PendingIntent);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setInputAction(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setMax(int);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setMin(int);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setSubtitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setTitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int, boolean);
-    method public androidx.slice.builders.ListBuilder.RatingBuilder setValue(float);
-  }
-
-  public static class ListBuilder.RowBuilder {
-    ctor public ListBuilder.RowBuilder();
-    ctor public ListBuilder.RowBuilder(android.net.Uri);
-    method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.core.graphics.drawable.IconCompat?, int, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(androidx.slice.builders.SliceAction, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder addEndItem(long);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setContentDescription(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setEndOfSection(boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setLayoutDirection(int);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setSubtitle(CharSequence?, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitle(CharSequence);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitle(CharSequence?, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat, int);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.core.graphics.drawable.IconCompat?, int, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(androidx.slice.builders.SliceAction, boolean);
-    method public androidx.slice.builders.ListBuilder.RowBuilder setTitleItem(long);
-  }
-
-  @RequiresApi(19) public class SelectionBuilder {
-    ctor public SelectionBuilder();
-    method public androidx.slice.builders.SelectionBuilder! addOption(String!, CharSequence!);
-    method public androidx.slice.builders.SelectionBuilder! setContentDescription(CharSequence?);
-    method public androidx.slice.builders.SelectionBuilder! setInputAction(android.app.PendingIntent);
-    method public androidx.slice.builders.SelectionBuilder! setInputAction(androidx.remotecallback.RemoteCallback);
-    method public androidx.slice.builders.SelectionBuilder! setLayoutDirection(int);
-    method public androidx.slice.builders.SelectionBuilder! setPrimaryAction(androidx.slice.builders.SliceAction);
-    method public androidx.slice.builders.SelectionBuilder! setSelectedOption(String!);
-    method public androidx.slice.builders.SelectionBuilder! setSubtitle(CharSequence?);
-    method public androidx.slice.builders.SelectionBuilder! setTitle(CharSequence?);
-  }
-
-  @RequiresApi(19) public class SliceAction implements androidx.slice.core.SliceAction {
-    method public static androidx.slice.builders.SliceAction! create(android.app.PendingIntent, androidx.core.graphics.drawable.IconCompat, int, CharSequence);
-    method public static androidx.slice.builders.SliceAction! create(androidx.remotecallback.RemoteCallback, androidx.core.graphics.drawable.IconCompat, int, CharSequence);
-    method public static androidx.slice.builders.SliceAction! createDeeplink(android.app.PendingIntent, androidx.core.graphics.drawable.IconCompat, int, CharSequence);
-    method public static androidx.slice.builders.SliceAction! createDeeplink(androidx.remotecallback.RemoteCallback, androidx.core.graphics.drawable.IconCompat, int, CharSequence);
-    method public static androidx.slice.builders.SliceAction! createToggle(android.app.PendingIntent, androidx.core.graphics.drawable.IconCompat, CharSequence, boolean);
-    method public static androidx.slice.builders.SliceAction! createToggle(android.app.PendingIntent, CharSequence, boolean);
-    method public static androidx.slice.builders.SliceAction! createToggle(androidx.remotecallback.RemoteCallback, androidx.core.graphics.drawable.IconCompat, CharSequence, boolean);
-    method public static androidx.slice.builders.SliceAction! createToggle(androidx.remotecallback.RemoteCallback, CharSequence, boolean);
-    method public android.app.PendingIntent getAction();
-    method public CharSequence? getContentDescription();
-    method public androidx.core.graphics.drawable.IconCompat? getIcon();
-    method public int getImageMode();
-    method public String? getKey();
-    method public int getPriority();
-    method public CharSequence getTitle();
-    method public boolean isActivity();
-    method public boolean isChecked();
-    method public boolean isDefaultToggle();
-    method public boolean isToggle();
-    method public androidx.slice.builders.SliceAction setChecked(boolean);
-    method public androidx.slice.core.SliceAction setContentDescription(CharSequence);
-    method public androidx.slice.builders.SliceAction setKey(String);
-    method public androidx.slice.builders.SliceAction setPriority(@IntRange(from=0) int);
-  }
-
-  @RequiresApi(19) public abstract class TemplateSliceBuilder {
-    method public androidx.slice.Slice build();
-  }
-
-}
-
diff --git a/slice/slice-core/api/public_plus_experimental_current.txt b/slice/slice-core/api/public_plus_experimental_current.txt
deleted file mode 100644
index 6a6b471..0000000
--- a/slice/slice-core/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-// Signature format: 4.0
-package androidx.slice {
-
-  @RequiresApi(19) public final class Slice implements androidx.versionedparcelable.VersionedParcelable {
-    method public java.util.List<java.lang.String!> getHints();
-    method public java.util.List<androidx.slice.SliceItem!> getItems();
-    method public android.net.Uri getUri();
-    field public static final String EXTRA_SELECTION = "android.app.slice.extra.SELECTION";
-  }
-
-  @RequiresApi(28) public class SliceConvert {
-    method public static android.app.slice.Slice? unwrap(androidx.slice.Slice?);
-    method public static androidx.slice.Slice? wrap(android.app.slice.Slice?, android.content.Context);
-  }
-
-  @RequiresApi(19) public final class SliceItem implements androidx.versionedparcelable.VersionedParcelable {
-    method public static android.text.ParcelableSpan createSensitiveSpan();
-    method public void fireAction(android.content.Context?, android.content.Intent?) throws android.app.PendingIntent.CanceledException;
-    method public android.app.PendingIntent? getAction();
-    method public String getFormat();
-    method public java.util.List<java.lang.String!> getHints();
-    method public androidx.core.graphics.drawable.IconCompat? getIcon();
-    method public int getInt();
-    method public long getLong();
-    method public CharSequence? getRedactedText();
-    method public androidx.slice.Slice? getSlice();
-    method public String? getSubType();
-    method public CharSequence? getText();
-    method public boolean hasHint(String);
-    method public void onPostParceling();
-    method public void onPreParceling(boolean);
-  }
-
-  @RequiresApi(19) public abstract class SliceManager {
-    method public abstract int checkSlicePermission(android.net.Uri, int, int);
-    method public static androidx.slice.SliceManager getInstance(android.content.Context);
-    method public abstract java.util.List<android.net.Uri!> getPinnedSlices();
-    method public abstract void grantSlicePermission(String, android.net.Uri);
-    method public abstract void revokeSlicePermission(String, android.net.Uri);
-  }
-
-  public abstract class SliceProvider extends android.content.ContentProvider {
-    ctor public SliceProvider();
-    ctor public SliceProvider(java.lang.String!...);
-    method public final int bulkInsert(android.net.Uri, android.content.ContentValues![]);
-    method @RequiresApi(19) public final android.net.Uri? canonicalize(android.net.Uri);
-    method public final int delete(android.net.Uri, String?, String![]?);
-    method @RequiresApi(19) public java.util.List<android.net.Uri!> getPinnedSlices();
-    method public final String? getType(android.net.Uri);
-    method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
-    method @RequiresApi(19) public abstract androidx.slice.Slice? onBindSlice(android.net.Uri);
-    method public final boolean onCreate();
-    method public android.app.PendingIntent? onCreatePermissionRequest(android.net.Uri, String);
-    method @RequiresApi(19) public abstract boolean onCreateSliceProvider();
-    method @RequiresApi(19) public java.util.Collection<android.net.Uri!> onGetSliceDescendants(android.net.Uri);
-    method @RequiresApi(19) public android.net.Uri onMapIntentToUri(android.content.Intent);
-    method @RequiresApi(19) public void onSlicePinned(android.net.Uri);
-    method @RequiresApi(19) public void onSliceUnpinned(android.net.Uri);
-    method @RequiresApi(28) public final android.database.Cursor? query(android.net.Uri, String![]?, android.os.Bundle?, android.os.CancellationSignal?);
-    method public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
-    method @RequiresApi(16) public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?, android.os.CancellationSignal?);
-    method public final int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
-  }
-
-}
-
-package androidx.slice.core {
-
-  @RequiresApi(19) public interface SliceAction {
-    method public android.app.PendingIntent getAction();
-    method public CharSequence? getContentDescription();
-    method public androidx.core.graphics.drawable.IconCompat? getIcon();
-    method public int getImageMode();
-    method public String? getKey();
-    method public int getPriority();
-    method public CharSequence getTitle();
-    method public boolean isActivity();
-    method public boolean isChecked();
-    method public boolean isDefaultToggle();
-    method public boolean isToggle();
-    method public androidx.slice.core.SliceAction setChecked(boolean);
-    method public androidx.slice.core.SliceAction setContentDescription(CharSequence);
-    method public androidx.slice.core.SliceAction setKey(String);
-    method public androidx.slice.core.SliceAction setPriority(@IntRange(from=0) int);
-  }
-
-}
-
diff --git a/slice/slice-remotecallback/api/public_plus_experimental_current.txt b/slice/slice-remotecallback/api/public_plus_experimental_current.txt
deleted file mode 100644
index 5eed69e..0000000
--- a/slice/slice-remotecallback/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 4.0
-package androidx.slice.remotecallback {
-
-  public abstract class RemoteSliceProvider<T extends androidx.slice.remotecallback.RemoteSliceProvider> extends androidx.slice.SliceProvider implements androidx.remotecallback.CallbackReceiver<T> {
-    ctor public RemoteSliceProvider();
-    method public T createRemoteCallback(android.content.Context);
-  }
-
-}
-
diff --git a/slice/slice-view/api/public_plus_experimental_current.txt b/slice/slice-view/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9ba9a2f..0000000
--- a/slice/slice-view/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,236 +0,0 @@
-// Signature format: 4.0
-package androidx.slice {
-
-  @RequiresApi(19) public class SliceMetadata {
-    method public static androidx.slice.SliceMetadata from(android.content.Context?, androidx.slice.Slice);
-    method public long getExpiry();
-    method public int getHeaderType();
-    method public android.os.Bundle getHostExtras();
-    method public android.app.PendingIntent? getInputRangeAction();
-    method public long getLastUpdatedTime();
-    method public int getLoadingState();
-    method public androidx.slice.core.SliceAction? getPrimaryAction();
-    method public androidx.core.util.Pair<java.lang.Integer!,java.lang.Integer!>? getRange();
-    method public int getRangeValue();
-    method public java.util.List<androidx.slice.core.SliceAction!>? getSliceActions();
-    method public java.util.List<java.lang.String!>? getSliceKeywords();
-    method public CharSequence? getSubtitle();
-    method public CharSequence? getSummary();
-    method public CharSequence? getTitle();
-    method public java.util.List<androidx.slice.core.SliceAction!>! getToggles();
-    method public boolean hasLargeMode();
-    method public boolean isCachedSlice();
-    method public boolean isErrorSlice();
-    method public boolean isPermissionSlice();
-    method public boolean isSelection();
-    method public boolean sendInputRangeAction(int) throws android.app.PendingIntent.CanceledException;
-    method public boolean sendToggleAction(androidx.slice.core.SliceAction!, boolean) throws android.app.PendingIntent.CanceledException;
-    field public static final int LOADED_ALL = 2; // 0x2
-    field public static final int LOADED_NONE = 0; // 0x0
-    field public static final int LOADED_PARTIAL = 1; // 0x1
-  }
-
-  @RequiresApi(19) public class SliceStructure {
-    ctor public SliceStructure(androidx.slice.Slice!);
-  }
-
-  @RequiresApi(19) public class SliceUtils {
-    method public static androidx.slice.Slice parseSlice(android.content.Context, java.io.InputStream, String, androidx.slice.SliceUtils.SliceActionListener) throws java.io.IOException, androidx.slice.SliceUtils.SliceParseException;
-    method public static void serializeSlice(androidx.slice.Slice, android.content.Context, java.io.OutputStream, androidx.slice.SliceUtils.SerializeOptions) throws java.lang.IllegalArgumentException;
-    method public static androidx.slice.Slice stripSlice(androidx.slice.Slice, int, boolean);
-  }
-
-  public static class SliceUtils.SerializeOptions {
-    ctor public SliceUtils.SerializeOptions();
-    method public androidx.slice.SliceUtils.SerializeOptions! setActionMode(int);
-    method public androidx.slice.SliceUtils.SerializeOptions! setImageConversionFormat(android.graphics.Bitmap.CompressFormat!, int);
-    method public androidx.slice.SliceUtils.SerializeOptions! setImageMode(int);
-    method public androidx.slice.SliceUtils.SerializeOptions! setMaxImageHeight(int);
-    method public androidx.slice.SliceUtils.SerializeOptions! setMaxImageWidth(int);
-    field public static final int MODE_CONVERT = 2; // 0x2
-    field public static final int MODE_REMOVE = 1; // 0x1
-    field public static final int MODE_THROW = 0; // 0x0
-  }
-
-  public static interface SliceUtils.SliceActionListener {
-    method public void onSliceAction(android.net.Uri!, android.content.Context!, android.content.Intent!);
-  }
-
-  public static class SliceUtils.SliceParseException extends java.lang.Exception {
-  }
-
-  @RequiresApi(19) public abstract class SliceViewManager {
-    method public abstract androidx.slice.Slice? bindSlice(android.content.Intent);
-    method public abstract androidx.slice.Slice? bindSlice(android.net.Uri);
-    method public static androidx.slice.SliceViewManager getInstance(android.content.Context);
-    method @WorkerThread public abstract java.util.Collection<android.net.Uri!> getSliceDescendants(android.net.Uri);
-    method public abstract android.net.Uri? mapIntentToUri(android.content.Intent);
-    method public abstract void pinSlice(android.net.Uri);
-    method public abstract void registerSliceCallback(android.net.Uri, androidx.slice.SliceViewManager.SliceCallback);
-    method public abstract void registerSliceCallback(android.net.Uri, java.util.concurrent.Executor, androidx.slice.SliceViewManager.SliceCallback);
-    method public abstract void unpinSlice(android.net.Uri);
-    method public abstract void unregisterSliceCallback(android.net.Uri, androidx.slice.SliceViewManager.SliceCallback);
-  }
-
-  public static interface SliceViewManager.SliceCallback {
-    method public void onSliceUpdated(androidx.slice.Slice?);
-  }
-
-}
-
-package androidx.slice.widget {
-
-  @RequiresApi(19) public class EventInfo {
-    ctor public EventInfo(int, int, int, int);
-    method public void setPosition(int, int, int);
-    field public static final int ACTION_TYPE_BUTTON = 1; // 0x1
-    field public static final int ACTION_TYPE_CONTENT = 3; // 0x3
-    field public static final int ACTION_TYPE_SEE_MORE = 4; // 0x4
-    field public static final int ACTION_TYPE_SELECTION = 5; // 0x5
-    field public static final int ACTION_TYPE_SLIDER = 2; // 0x2
-    field public static final int ACTION_TYPE_TOGGLE = 0; // 0x0
-    field public static final int POSITION_CELL = 2; // 0x2
-    field public static final int POSITION_END = 1; // 0x1
-    field public static final int POSITION_START = 0; // 0x0
-    field public static final int ROW_TYPE_GRID = 1; // 0x1
-    field public static final int ROW_TYPE_LIST = 0; // 0x0
-    field public static final int ROW_TYPE_MESSAGING = 2; // 0x2
-    field public static final int ROW_TYPE_PROGRESS = 5; // 0x5
-    field public static final int ROW_TYPE_SELECTION = 6; // 0x6
-    field public static final int ROW_TYPE_SHORTCUT = -1; // 0xffffffff
-    field public static final int ROW_TYPE_SLIDER = 4; // 0x4
-    field public static final int ROW_TYPE_TOGGLE = 3; // 0x3
-    field public static final int STATE_OFF = 0; // 0x0
-    field public static final int STATE_ON = 1; // 0x1
-    field public int actionCount;
-    field public int actionIndex;
-    field public int actionPosition;
-    field public int actionType;
-    field public int rowIndex;
-    field public int rowTemplateType;
-    field public int sliceMode;
-    field public int state;
-  }
-
-  @RequiresApi(19) public class GridContent extends androidx.slice.widget.SliceContent {
-    method public android.graphics.Point getFirstImageSize(android.content.Context);
-    method public boolean isValid();
-  }
-
-  @RequiresApi(19) public class GridRowView extends androidx.slice.widget.SliceChildView implements android.view.View.OnClickListener android.view.View.OnTouchListener {
-    ctor public GridRowView(android.content.Context);
-    ctor public GridRowView(android.content.Context, android.util.AttributeSet?);
-    method protected boolean addImageItem(androidx.slice.SliceItem, androidx.slice.SliceItem?, int, android.view.ViewGroup, boolean);
-    method protected int getExtraBottomPadding();
-    method protected int getExtraTopPadding();
-    method protected int getMaxCells();
-    method protected int getTitleTextLayout();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public void onClick(android.view.View);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public boolean onTouch(android.view.View, android.view.MotionEvent);
-    method protected void populateViews();
-    method public void resetView();
-    method protected boolean scheduleMaxCellsUpdate();
-  }
-
-  public interface RowStyleFactory {
-    method @StyleRes public int getRowStyleRes(androidx.slice.SliceItem);
-  }
-
-  @RequiresApi(19) public class RowView extends androidx.slice.widget.SliceChildView implements android.widget.AdapterView.OnItemSelectedListener android.view.View.OnClickListener {
-    ctor public RowView(android.content.Context);
-    method protected java.util.List<java.lang.String!> getEndItemKeys();
-    method protected androidx.slice.SliceItem? getPrimaryActionItem();
-    method protected String? getPrimaryActionKey();
-    method public void onClick(android.view.View);
-    method public void onItemSelected(android.widget.AdapterView<?>, android.view.View, int, long);
-    method public void onNothingSelected(android.widget.AdapterView<?>);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public void resetView();
-  }
-
-  @RequiresApi(19) public class SliceAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.slice.widget.SliceAdapter.SliceViewHolder> {
-    ctor public SliceAdapter(android.content.Context);
-    method public androidx.slice.widget.GridRowView getGridRowView();
-    method public int getItemCount();
-    method public androidx.slice.widget.RowView getRowView();
-    method public void onBindViewHolder(androidx.slice.widget.SliceAdapter.SliceViewHolder, int);
-    method public androidx.slice.widget.SliceAdapter.SliceViewHolder onCreateViewHolder(android.view.ViewGroup, int);
-  }
-
-  @RequiresApi(19) public abstract class SliceChildView extends android.widget.FrameLayout {
-    ctor public SliceChildView(android.content.Context);
-    ctor public SliceChildView(android.content.Context, android.util.AttributeSet?);
-    method public abstract void resetView();
-    method public void setSliceItem(androidx.slice.widget.SliceContent?, boolean, int, int, androidx.slice.widget.SliceView.OnSliceActionListener?);
-  }
-
-  @RequiresApi(19) public class SliceContent {
-    ctor public SliceContent(androidx.slice.Slice?);
-  }
-
-  @RequiresApi(19) public final class SliceLiveData {
-    method public static androidx.slice.widget.SliceLiveData.CachedSliceLiveData fromCachedSlice(android.content.Context, java.io.InputStream, androidx.slice.widget.SliceLiveData.OnErrorListener!);
-    method public static androidx.lifecycle.LiveData<androidx.slice.Slice!> fromIntent(android.content.Context, android.content.Intent);
-    method public static androidx.lifecycle.LiveData<androidx.slice.Slice!> fromIntent(android.content.Context, android.content.Intent, androidx.slice.widget.SliceLiveData.OnErrorListener?);
-    method public static androidx.lifecycle.LiveData<androidx.slice.Slice!> fromStream(android.content.Context, java.io.InputStream, androidx.slice.widget.SliceLiveData.OnErrorListener!);
-    method public static androidx.lifecycle.LiveData<androidx.slice.Slice!> fromUri(android.content.Context, android.net.Uri);
-    method public static androidx.lifecycle.LiveData<androidx.slice.Slice!> fromUri(android.content.Context, android.net.Uri, androidx.slice.widget.SliceLiveData.OnErrorListener?);
-  }
-
-  public static class SliceLiveData.CachedSliceLiveData extends androidx.lifecycle.LiveData<androidx.slice.Slice> {
-    method public void goLive();
-    method public void parseStream();
-  }
-
-  public static interface SliceLiveData.OnErrorListener {
-    method public void onSliceError(@androidx.slice.widget.SliceLiveData.OnErrorListener.ErrorType int, Throwable?);
-    field public static final int ERROR_INVALID_INPUT = 3; // 0x3
-    field public static final int ERROR_SLICE_NO_LONGER_PRESENT = 2; // 0x2
-    field public static final int ERROR_STRUCTURE_CHANGED = 1; // 0x1
-    field public static final int ERROR_UNKNOWN = 0; // 0x0
-  }
-
-  @IntDef({androidx.slice.widget.SliceLiveData.OnErrorListener.ERROR_UNKNOWN, androidx.slice.widget.SliceLiveData.OnErrorListener.ERROR_STRUCTURE_CHANGED, androidx.slice.widget.SliceLiveData.OnErrorListener.ERROR_SLICE_NO_LONGER_PRESENT, androidx.slice.widget.SliceLiveData.OnErrorListener.ERROR_INVALID_INPUT}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface SliceLiveData.OnErrorListener.ErrorType {
-  }
-
-  @RequiresApi(19) public class SliceView extends android.view.ViewGroup implements androidx.lifecycle.Observer<androidx.slice.Slice> android.view.View.OnClickListener {
-    ctor public SliceView(android.content.Context!);
-    ctor public SliceView(android.content.Context!, android.util.AttributeSet?);
-    ctor public SliceView(android.content.Context!, android.util.AttributeSet?, int);
-    ctor @RequiresApi(21) public SliceView(android.content.Context!, android.util.AttributeSet!, int, int);
-    method protected void configureViewPolicy(int);
-    method public int getHiddenItemCount();
-    method public int getMode();
-    method public androidx.slice.Slice? getSlice();
-    method public java.util.List<androidx.slice.core.SliceAction!>? getSliceActions();
-    method public boolean isScrollable();
-    method public void onChanged(androidx.slice.Slice?);
-    method public void onClick(android.view.View!);
-    method public void setAccentColor(@ColorInt int);
-    method public void setCurrentView(androidx.slice.widget.SliceChildView);
-    method public void setMode(int);
-    method public void setOnSliceActionListener(androidx.slice.widget.SliceView.OnSliceActionListener?);
-    method public void setRowStyleFactory(androidx.slice.widget.RowStyleFactory?);
-    method public void setScrollable(boolean);
-    method public void setShowActionDividers(boolean);
-    method public void setShowHeaderDivider(boolean);
-    method public void setShowTitleItems(boolean);
-    method public void setSlice(androidx.slice.Slice?);
-    method public void setSliceActions(java.util.List<androidx.slice.core.SliceAction!>?);
-    field public static final int MODE_LARGE = 2; // 0x2
-    field public static final int MODE_SHORTCUT = 3; // 0x3
-    field public static final int MODE_SMALL = 1; // 0x1
-  }
-
-  public static interface SliceView.OnSliceActionListener {
-    method public void onSliceAction(androidx.slice.widget.EventInfo, androidx.slice.SliceItem);
-  }
-
-  @RequiresApi(19) public class TemplateView extends androidx.slice.widget.SliceChildView {
-    ctor public TemplateView(android.content.Context);
-    method public void onAttachedToWindow();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public void resetView();
-    method public void setAdapter(androidx.slice.widget.SliceAdapter);
-  }
-
-}
-
diff --git a/slidingpanelayout/slidingpanelayout/api/public_plus_experimental_current.txt b/slidingpanelayout/slidingpanelayout/api/public_plus_experimental_current.txt
deleted file mode 100644
index 27dc80b..0000000
--- a/slidingpanelayout/slidingpanelayout/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-// Signature format: 4.0
-package androidx.slidingpanelayout.widget {
-
-  public class SlidingPaneLayout extends android.view.ViewGroup implements androidx.customview.widget.Openable {
-    ctor public SlidingPaneLayout(android.content.Context);
-    ctor public SlidingPaneLayout(android.content.Context, android.util.AttributeSet?);
-    ctor public SlidingPaneLayout(android.content.Context, android.util.AttributeSet?, int);
-    method public void addPanelSlideListener(androidx.slidingpanelayout.widget.SlidingPaneLayout.PanelSlideListener);
-    method public void addSlideableStateListener(androidx.slidingpanelayout.widget.SlidingPaneLayout.SlideableStateListener);
-    method protected boolean canScroll(android.view.View, boolean, int, int, int);
-    method @Deprecated public boolean canSlide();
-    method public void close();
-    method public boolean closePane();
-    method @Deprecated @ColorInt public int getCoveredFadeColor();
-    method public final int getLockMode();
-    method @Px public int getParallaxDistance();
-    method @Deprecated @ColorInt public int getSliderFadeColor();
-    method public boolean isOpen();
-    method public boolean isSlideable();
-    method public void open();
-    method public boolean openPane();
-    method public void removePanelSlideListener(androidx.slidingpanelayout.widget.SlidingPaneLayout.PanelSlideListener);
-    method public void removeSlideableStateListener(androidx.slidingpanelayout.widget.SlidingPaneLayout.SlideableStateListener);
-    method @Deprecated public void setCoveredFadeColor(@ColorInt int);
-    method public final void setLockMode(int);
-    method @Deprecated public void setPanelSlideListener(androidx.slidingpanelayout.widget.SlidingPaneLayout.PanelSlideListener?);
-    method public void setParallaxDistance(@Px int);
-    method @Deprecated public void setShadowDrawable(android.graphics.drawable.Drawable!);
-    method public void setShadowDrawableLeft(android.graphics.drawable.Drawable?);
-    method public void setShadowDrawableRight(android.graphics.drawable.Drawable?);
-    method @Deprecated public void setShadowResource(@DrawableRes int);
-    method public void setShadowResourceLeft(int);
-    method public void setShadowResourceRight(int);
-    method @Deprecated public void setSliderFadeColor(@ColorInt int);
-    method @Deprecated public void smoothSlideClosed();
-    method @Deprecated public void smoothSlideOpen();
-    field public static final int LOCK_MODE_LOCKED = 3; // 0x3
-    field public static final int LOCK_MODE_LOCKED_CLOSED = 2; // 0x2
-    field public static final int LOCK_MODE_LOCKED_OPEN = 1; // 0x1
-    field public static final int LOCK_MODE_UNLOCKED = 0; // 0x0
-  }
-
-  public static class SlidingPaneLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
-    ctor public SlidingPaneLayout.LayoutParams();
-    ctor public SlidingPaneLayout.LayoutParams(android.content.Context, android.util.AttributeSet?);
-    ctor public SlidingPaneLayout.LayoutParams(android.view.ViewGroup.LayoutParams);
-    ctor public SlidingPaneLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams);
-    ctor public SlidingPaneLayout.LayoutParams(androidx.slidingpanelayout.widget.SlidingPaneLayout.LayoutParams);
-    ctor public SlidingPaneLayout.LayoutParams(int, int);
-    field public float weight;
-  }
-
-  public static interface SlidingPaneLayout.PanelSlideListener {
-    method public void onPanelClosed(android.view.View);
-    method public void onPanelOpened(android.view.View);
-    method public void onPanelSlide(android.view.View, float);
-  }
-
-  public static class SlidingPaneLayout.SimplePanelSlideListener implements androidx.slidingpanelayout.widget.SlidingPaneLayout.PanelSlideListener {
-    ctor public SlidingPaneLayout.SimplePanelSlideListener();
-    method public void onPanelClosed(android.view.View);
-    method public void onPanelOpened(android.view.View);
-    method public void onPanelSlide(android.view.View, float);
-  }
-
-  public static interface SlidingPaneLayout.SlideableStateListener {
-    method public void onSlideableStateChanged(boolean);
-  }
-
-}
-
diff --git a/sqlite/sqlite-framework/api/public_plus_experimental_current.txt b/sqlite/sqlite-framework/api/public_plus_experimental_current.txt
deleted file mode 100644
index f7d3aae..0000000
--- a/sqlite/sqlite-framework/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 4.0
-package androidx.sqlite.db.framework {
-
-  public final class FrameworkSQLiteOpenHelperFactory implements androidx.sqlite.db.SupportSQLiteOpenHelper.Factory {
-    ctor public FrameworkSQLiteOpenHelperFactory();
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper create(androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration configuration);
-  }
-
-}
-
diff --git a/sqlite/sqlite-ktx/api/public_plus_experimental_current.txt b/sqlite/sqlite-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 3b12c09..0000000
--- a/sqlite/sqlite-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.sqlite.db {
-
-  public final class SupportSQLiteDatabaseKt {
-    method public static inline <T> T transaction(androidx.sqlite.db.SupportSQLiteDatabase, optional boolean exclusive, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,? extends T> body);
-  }
-
-}
-
diff --git a/sqlite/sqlite/api/public_plus_experimental_current.txt b/sqlite/sqlite/api/public_plus_experimental_current.txt
deleted file mode 100644
index 3e4733c..0000000
--- a/sqlite/sqlite/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-// Signature format: 4.0
-package androidx.sqlite.db {
-
-  public final class SimpleSQLiteQuery implements androidx.sqlite.db.SupportSQLiteQuery {
-    ctor public SimpleSQLiteQuery(String query);
-    ctor public SimpleSQLiteQuery(String query, Object![]? bindArgs);
-    method public static void bind(androidx.sqlite.db.SupportSQLiteProgram statement, Object![]? bindArgs);
-    method public void bindTo(androidx.sqlite.db.SupportSQLiteProgram statement);
-    method public int getArgCount();
-    method public String getSql();
-    property public int argCount;
-    property public String sql;
-    field public static final androidx.sqlite.db.SimpleSQLiteQuery.Companion Companion;
-  }
-
-  public static final class SimpleSQLiteQuery.Companion {
-    method public void bind(androidx.sqlite.db.SupportSQLiteProgram statement, Object![]? bindArgs);
-  }
-
-  public interface SupportSQLiteDatabase extends java.io.Closeable {
-    method public void beginTransaction();
-    method public void beginTransactionNonExclusive();
-    method public void beginTransactionWithListener(android.database.sqlite.SQLiteTransactionListener transactionListener);
-    method public void beginTransactionWithListenerNonExclusive(android.database.sqlite.SQLiteTransactionListener transactionListener);
-    method public androidx.sqlite.db.SupportSQLiteStatement compileStatement(String sql);
-    method public int delete(String table, String? whereClause, Object![]? whereArgs);
-    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public void disableWriteAheadLogging();
-    method public boolean enableWriteAheadLogging();
-    method public void endTransaction();
-    method public default void execPerConnectionSQL(String sql, Object![]? bindArgs);
-    method @kotlin.jvm.Throws(exceptionClasses=SQLException::class) public void execSQL(String sql) throws android.database.SQLException;
-    method @kotlin.jvm.Throws(exceptionClasses=SQLException::class) public void execSQL(String sql, Object![] bindArgs) throws android.database.SQLException;
-    method public java.util.List<android.util.Pair<java.lang.String,java.lang.String>>? getAttachedDbs();
-    method public long getMaximumSize();
-    method public long getPageSize();
-    method public String? getPath();
-    method public int getVersion();
-    method public boolean inTransaction();
-    method @kotlin.jvm.Throws(exceptionClasses=SQLException::class) public long insert(String table, int conflictAlgorithm, android.content.ContentValues values) throws android.database.SQLException;
-    method public boolean isDatabaseIntegrityOk();
-    method public boolean isDbLockedByCurrentThread();
-    method public default boolean isExecPerConnectionSQLSupported();
-    method public boolean isOpen();
-    method public boolean isReadOnly();
-    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public boolean isWriteAheadLoggingEnabled();
-    method public boolean needUpgrade(int newVersion);
-    method public android.database.Cursor query(androidx.sqlite.db.SupportSQLiteQuery query);
-    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public android.database.Cursor query(androidx.sqlite.db.SupportSQLiteQuery query, android.os.CancellationSignal? cancellationSignal);
-    method public android.database.Cursor query(String query);
-    method public android.database.Cursor query(String query, Object![] bindArgs);
-    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public void setForeignKeyConstraintsEnabled(boolean enabled);
-    method public void setLocale(java.util.Locale locale);
-    method public void setMaxSqlCacheSize(int cacheSize);
-    method public long setMaximumSize(long numBytes);
-    method public void setPageSize(long);
-    method public void setTransactionSuccessful();
-    method public void setVersion(int);
-    method public int update(String table, int conflictAlgorithm, android.content.ContentValues values, String? whereClause, Object![]? whereArgs);
-    method public boolean yieldIfContendedSafely();
-    method public boolean yieldIfContendedSafely(long sleepAfterYieldDelayMillis);
-    property public abstract java.util.List<android.util.Pair<java.lang.String,java.lang.String>>? attachedDbs;
-    property public abstract boolean isDatabaseIntegrityOk;
-    property public abstract boolean isDbLockedByCurrentThread;
-    property public default boolean isExecPerConnectionSQLSupported;
-    property public abstract boolean isOpen;
-    property public abstract boolean isReadOnly;
-    property @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public abstract boolean isWriteAheadLoggingEnabled;
-    property public abstract long maximumSize;
-    property public abstract long pageSize;
-    property public abstract String? path;
-    property public abstract int version;
-  }
-
-  public interface SupportSQLiteOpenHelper extends java.io.Closeable {
-    method public void close();
-    method public String? getDatabaseName();
-    method public androidx.sqlite.db.SupportSQLiteDatabase getReadableDatabase();
-    method public androidx.sqlite.db.SupportSQLiteDatabase getWritableDatabase();
-    method @RequiresApi(api=android.os.Build.VERSION_CODES.JELLY_BEAN) public void setWriteAheadLoggingEnabled(boolean enabled);
-    property public abstract String? databaseName;
-    property public abstract androidx.sqlite.db.SupportSQLiteDatabase readableDatabase;
-    property public abstract androidx.sqlite.db.SupportSQLiteDatabase writableDatabase;
-  }
-
-  public abstract static class SupportSQLiteOpenHelper.Callback {
-    ctor public SupportSQLiteOpenHelper.Callback(int version);
-    method public void onConfigure(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public void onCorruption(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public abstract void onCreate(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public void onDowngrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
-    method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase db);
-    method public abstract void onUpgrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
-    field public final int version;
-  }
-
-  public static final class SupportSQLiteOpenHelper.Configuration {
-    ctor public SupportSQLiteOpenHelper.Configuration(android.content.Context context, String? name, androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback, optional boolean useNoBackupDirectory, optional boolean allowDataLossOnRecovery);
-    method public static androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder builder(android.content.Context context);
-    field public static final androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Companion Companion;
-    field public final boolean allowDataLossOnRecovery;
-    field public final androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback;
-    field public final android.content.Context context;
-    field public final String? name;
-    field public final boolean useNoBackupDirectory;
-  }
-
-  public static class SupportSQLiteOpenHelper.Configuration.Builder {
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder allowDataLossOnRecovery(boolean allowDataLossOnRecovery);
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration build();
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder callback(androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback);
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder name(String? name);
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder noBackupDirectory(boolean useNoBackupDirectory);
-  }
-
-  public static final class SupportSQLiteOpenHelper.Configuration.Companion {
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder builder(android.content.Context context);
-  }
-
-  public static fun interface SupportSQLiteOpenHelper.Factory {
-    method public androidx.sqlite.db.SupportSQLiteOpenHelper create(androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration configuration);
-  }
-
-  public interface SupportSQLiteProgram extends java.io.Closeable {
-    method public void bindBlob(int index, byte[] value);
-    method public void bindDouble(int index, double value);
-    method public void bindLong(int index, long value);
-    method public void bindNull(int index);
-    method public void bindString(int index, String value);
-    method public void clearBindings();
-  }
-
-  public interface SupportSQLiteQuery {
-    method public void bindTo(androidx.sqlite.db.SupportSQLiteProgram statement);
-    method public int getArgCount();
-    method public String getSql();
-    property public abstract int argCount;
-    property public abstract String sql;
-  }
-
-  public final class SupportSQLiteQueryBuilder {
-    method public static androidx.sqlite.db.SupportSQLiteQueryBuilder builder(String tableName);
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder columns(String![]? columns);
-    method public androidx.sqlite.db.SupportSQLiteQuery create();
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder distinct();
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder groupBy(String? groupBy);
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder having(String? having);
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder limit(String limit);
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder orderBy(String? orderBy);
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder selection(String? selection, Object![]? bindArgs);
-    field public static final androidx.sqlite.db.SupportSQLiteQueryBuilder.Companion Companion;
-  }
-
-  public static final class SupportSQLiteQueryBuilder.Companion {
-    method public androidx.sqlite.db.SupportSQLiteQueryBuilder builder(String tableName);
-  }
-
-  public interface SupportSQLiteStatement extends androidx.sqlite.db.SupportSQLiteProgram {
-    method public void execute();
-    method public long executeInsert();
-    method public int executeUpdateDelete();
-    method public long simpleQueryForLong();
-    method public String? simpleQueryForString();
-  }
-
-}
-
diff --git a/startup/startup-runtime/api/public_plus_experimental_current.txt b/startup/startup-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index 434ba26..0000000
--- a/startup/startup-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Signature format: 4.0
-package androidx.startup {
-
-  public final class AppInitializer {
-    method public static androidx.startup.AppInitializer getInstance(android.content.Context);
-    method public <T> T initializeComponent(Class<? extends androidx.startup.Initializer<T!>>);
-    method public boolean isEagerlyInitialized(Class<? extends androidx.startup.Initializer<?>>);
-  }
-
-  public class InitializationProvider extends android.content.ContentProvider {
-    ctor public InitializationProvider();
-    method public final int delete(android.net.Uri, String?, String![]?);
-    method public final String? getType(android.net.Uri);
-    method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
-    method public final boolean onCreate();
-    method public final android.database.Cursor? query(android.net.Uri, String![]?, String?, String![]?, String?);
-    method public final int update(android.net.Uri, android.content.ContentValues?, String?, String![]?);
-  }
-
-  public interface Initializer<T> {
-    method public T create(android.content.Context);
-    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>!> dependencies();
-  }
-
-}
-
diff --git a/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt b/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt
deleted file mode 100644
index 259df79..0000000
--- a/swiperefreshlayout/swiperefreshlayout/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-// Signature format: 4.0
-package androidx.swiperefreshlayout.widget {
-
-  public class CircularProgressDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable {
-    ctor public CircularProgressDrawable(android.content.Context);
-    method public void draw(android.graphics.Canvas);
-    method public boolean getArrowEnabled();
-    method public float getArrowHeight();
-    method public float getArrowScale();
-    method public float getArrowWidth();
-    method public int getBackgroundColor();
-    method public float getCenterRadius();
-    method public int[] getColorSchemeColors();
-    method public float getEndTrim();
-    method public int getOpacity();
-    method public float getProgressRotation();
-    method public float getStartTrim();
-    method public android.graphics.Paint.Cap getStrokeCap();
-    method public float getStrokeWidth();
-    method public boolean isRunning();
-    method public void setAlpha(int);
-    method public void setArrowDimensions(float, float);
-    method public void setArrowEnabled(boolean);
-    method public void setArrowScale(float);
-    method public void setBackgroundColor(int);
-    method public void setCenterRadius(float);
-    method public void setColorFilter(android.graphics.ColorFilter!);
-    method public void setColorSchemeColors(int...);
-    method public void setProgressRotation(float);
-    method public void setStartEndTrim(float, float);
-    method public void setStrokeCap(android.graphics.Paint.Cap);
-    method public void setStrokeWidth(float);
-    method public void setStyle(int);
-    method public void start();
-    method public void stop();
-    field public static final int DEFAULT = 1; // 0x1
-    field public static final int LARGE = 0; // 0x0
-  }
-
-  public class SwipeRefreshLayout extends android.view.ViewGroup implements androidx.core.view.NestedScrollingChild androidx.core.view.NestedScrollingChild2 androidx.core.view.NestedScrollingChild3 androidx.core.view.NestedScrollingParent androidx.core.view.NestedScrollingParent2 androidx.core.view.NestedScrollingParent3 {
-    ctor public SwipeRefreshLayout(android.content.Context);
-    ctor public SwipeRefreshLayout(android.content.Context, android.util.AttributeSet?);
-    method public boolean canChildScrollUp();
-    method public boolean dispatchNestedPreScroll(int, int, int[]?, int[]?, int);
-    method public boolean dispatchNestedScroll(int, int, int, int, int[]?, int);
-    method public void dispatchNestedScroll(int, int, int, int, int[]?, int, int[]);
-    method public int getProgressCircleDiameter();
-    method public int getProgressViewEndOffset();
-    method public int getProgressViewStartOffset();
-    method public boolean hasNestedScrollingParent(int);
-    method public boolean isRefreshing();
-    method public void onMeasure(int, int);
-    method public void onNestedPreScroll(android.view.View, int, int, int[], int);
-    method public void onNestedScroll(android.view.View, int, int, int, int, int);
-    method public void onNestedScroll(android.view.View, int, int, int, int, int, int[]);
-    method public void onNestedScrollAccepted(android.view.View, android.view.View, int, int);
-    method public boolean onStartNestedScroll(android.view.View, android.view.View, int, int);
-    method public void onStopNestedScroll(android.view.View, int);
-    method @Deprecated public void setColorScheme(@ColorRes int...);
-    method public void setColorSchemeColors(@ColorInt int...);
-    method public void setColorSchemeResources(@ColorRes int...);
-    method public void setDistanceToTriggerSync(int);
-    method @Deprecated public void setLegacyRequestDisallowInterceptTouchEventEnabled(boolean);
-    method public void setOnChildScrollUpCallback(androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnChildScrollUpCallback?);
-    method public void setOnRefreshListener(androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener?);
-    method @Deprecated public void setProgressBackgroundColor(int);
-    method public void setProgressBackgroundColorSchemeColor(@ColorInt int);
-    method public void setProgressBackgroundColorSchemeResource(@ColorRes int);
-    method public void setProgressViewEndTarget(boolean, int);
-    method public void setProgressViewOffset(boolean, int, int);
-    method public void setRefreshing(boolean);
-    method public void setSize(int);
-    method public void setSlingshotDistance(@Px int);
-    method public boolean startNestedScroll(int, int);
-    method public void stopNestedScroll(int);
-    field public static final int DEFAULT = 1; // 0x1
-    field public static final int DEFAULT_SLINGSHOT_DISTANCE = -1; // 0xffffffff
-    field public static final int LARGE = 0; // 0x0
-    field protected int mFrom;
-    field protected int mOriginalOffsetTop;
-  }
-
-  public static interface SwipeRefreshLayout.OnChildScrollUpCallback {
-    method public boolean canChildScrollUp(androidx.swiperefreshlayout.widget.SwipeRefreshLayout, android.view.View?);
-  }
-
-  public static interface SwipeRefreshLayout.OnRefreshListener {
-    method public void onRefresh();
-  }
-
-}
-
diff --git a/test/ext/junit-gtest/api/public_plus_experimental_current.txt b/test/ext/junit-gtest/api/public_plus_experimental_current.txt
deleted file mode 100644
index 2062be0..0000000
--- a/test/ext/junit-gtest/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Signature format: 4.0
-package androidx.test.ext.junitgtest {
-
-  public final class GtestRunner extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable {
-    ctor public GtestRunner(Class<?> testClass);
-    method @kotlin.jvm.Throws(exceptionClasses=NoTestsRemainException::class) public void filter(org.junit.runner.manipulation.Filter filter) throws org.junit.runner.manipulation.NoTestsRemainException;
-    method public org.junit.runner.Description getDescription();
-    method public void run(org.junit.runner.notification.RunNotifier notifier);
-  }
-
-  @java.lang.annotation.Inherited @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface TargetLibrary {
-    method public abstract String libraryName();
-    property public abstract String libraryName;
-  }
-
-}
-
diff --git a/test/uiautomator/uiautomator/api/public_plus_experimental_current.txt b/test/uiautomator/uiautomator/api/public_plus_experimental_current.txt
deleted file mode 100644
index f479f1e..0000000
--- a/test/uiautomator/uiautomator/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,450 +0,0 @@
-// Signature format: 4.0
-package androidx.test.uiautomator {
-
-  public class By {
-    method public static androidx.test.uiautomator.BySelector checkable(boolean);
-    method public static androidx.test.uiautomator.BySelector checked(boolean);
-    method public static androidx.test.uiautomator.BySelector clazz(Class);
-    method public static androidx.test.uiautomator.BySelector clazz(String);
-    method public static androidx.test.uiautomator.BySelector clazz(String, String);
-    method public static androidx.test.uiautomator.BySelector clazz(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.BySelector clickable(boolean);
-    method public static androidx.test.uiautomator.BySelector copy(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.BySelector depth(int);
-    method public static androidx.test.uiautomator.BySelector desc(String);
-    method public static androidx.test.uiautomator.BySelector desc(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.BySelector descContains(String);
-    method public static androidx.test.uiautomator.BySelector descEndsWith(String);
-    method public static androidx.test.uiautomator.BySelector descStartsWith(String);
-    method public static androidx.test.uiautomator.BySelector enabled(boolean);
-    method public static androidx.test.uiautomator.BySelector focusable(boolean);
-    method public static androidx.test.uiautomator.BySelector focused(boolean);
-    method public static androidx.test.uiautomator.BySelector hasAncestor(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.BySelector hasAncestor(androidx.test.uiautomator.BySelector, @IntRange(from=1) int);
-    method public static androidx.test.uiautomator.BySelector hasChild(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.BySelector hasDescendant(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.BySelector hasDescendant(androidx.test.uiautomator.BySelector, int);
-    method public static androidx.test.uiautomator.BySelector hasParent(androidx.test.uiautomator.BySelector);
-    method @RequiresApi(26) public static androidx.test.uiautomator.BySelector hint(String);
-    method @RequiresApi(26) public static androidx.test.uiautomator.BySelector hint(java.util.regex.Pattern);
-    method @RequiresApi(26) public static androidx.test.uiautomator.BySelector hintContains(String);
-    method @RequiresApi(26) public static androidx.test.uiautomator.BySelector hintEndsWith(String);
-    method @RequiresApi(26) public static androidx.test.uiautomator.BySelector hintStartsWith(String);
-    method public static androidx.test.uiautomator.BySelector longClickable(boolean);
-    method public static androidx.test.uiautomator.BySelector pkg(String);
-    method public static androidx.test.uiautomator.BySelector pkg(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.BySelector res(String);
-    method public static androidx.test.uiautomator.BySelector res(String, String);
-    method public static androidx.test.uiautomator.BySelector res(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.BySelector scrollable(boolean);
-    method public static androidx.test.uiautomator.BySelector selected(boolean);
-    method public static androidx.test.uiautomator.BySelector text(String);
-    method public static androidx.test.uiautomator.BySelector text(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.BySelector textContains(String);
-    method public static androidx.test.uiautomator.BySelector textEndsWith(String);
-    method public static androidx.test.uiautomator.BySelector textStartsWith(String);
-  }
-
-  public class BySelector {
-    method public androidx.test.uiautomator.BySelector checkable(boolean);
-    method public androidx.test.uiautomator.BySelector checked(boolean);
-    method public androidx.test.uiautomator.BySelector clazz(Class);
-    method public androidx.test.uiautomator.BySelector clazz(String);
-    method public androidx.test.uiautomator.BySelector clazz(String, String);
-    method public androidx.test.uiautomator.BySelector clazz(java.util.regex.Pattern);
-    method public androidx.test.uiautomator.BySelector clickable(boolean);
-    method public androidx.test.uiautomator.BySelector depth(int);
-    method public androidx.test.uiautomator.BySelector depth(int, int);
-    method public androidx.test.uiautomator.BySelector desc(String);
-    method public androidx.test.uiautomator.BySelector desc(java.util.regex.Pattern);
-    method public androidx.test.uiautomator.BySelector descContains(String);
-    method public androidx.test.uiautomator.BySelector descEndsWith(String);
-    method public androidx.test.uiautomator.BySelector descStartsWith(String);
-    method public androidx.test.uiautomator.BySelector enabled(boolean);
-    method public androidx.test.uiautomator.BySelector focusable(boolean);
-    method public androidx.test.uiautomator.BySelector focused(boolean);
-    method public androidx.test.uiautomator.BySelector hasAncestor(androidx.test.uiautomator.BySelector);
-    method public androidx.test.uiautomator.BySelector hasAncestor(androidx.test.uiautomator.BySelector, @IntRange(from=1) int);
-    method public androidx.test.uiautomator.BySelector hasChild(androidx.test.uiautomator.BySelector);
-    method public androidx.test.uiautomator.BySelector hasDescendant(androidx.test.uiautomator.BySelector);
-    method public androidx.test.uiautomator.BySelector hasDescendant(androidx.test.uiautomator.BySelector, int);
-    method public androidx.test.uiautomator.BySelector hasParent(androidx.test.uiautomator.BySelector);
-    method @RequiresApi(26) public androidx.test.uiautomator.BySelector hint(String);
-    method @RequiresApi(26) public androidx.test.uiautomator.BySelector hint(java.util.regex.Pattern);
-    method @RequiresApi(26) public androidx.test.uiautomator.BySelector hintContains(String);
-    method @RequiresApi(26) public androidx.test.uiautomator.BySelector hintEndsWith(String);
-    method @RequiresApi(26) public androidx.test.uiautomator.BySelector hintStartsWith(String);
-    method public androidx.test.uiautomator.BySelector longClickable(boolean);
-    method public androidx.test.uiautomator.BySelector maxDepth(int);
-    method public androidx.test.uiautomator.BySelector minDepth(int);
-    method public androidx.test.uiautomator.BySelector pkg(String);
-    method public androidx.test.uiautomator.BySelector pkg(java.util.regex.Pattern);
-    method public androidx.test.uiautomator.BySelector res(String);
-    method public androidx.test.uiautomator.BySelector res(String, String);
-    method public androidx.test.uiautomator.BySelector res(java.util.regex.Pattern);
-    method public androidx.test.uiautomator.BySelector scrollable(boolean);
-    method public androidx.test.uiautomator.BySelector selected(boolean);
-    method public androidx.test.uiautomator.BySelector text(String);
-    method public androidx.test.uiautomator.BySelector text(java.util.regex.Pattern);
-    method public androidx.test.uiautomator.BySelector textContains(String);
-    method public androidx.test.uiautomator.BySelector textEndsWith(String);
-    method public androidx.test.uiautomator.BySelector textStartsWith(String);
-  }
-
-  public interface Condition<T, U> {
-    method public U! apply(T!);
-  }
-
-  public final class Configurator {
-    method public long getActionAcknowledgmentTimeout();
-    method public static androidx.test.uiautomator.Configurator getInstance();
-    method public long getKeyInjectionDelay();
-    method public long getScrollAcknowledgmentTimeout();
-    method public int getToolType();
-    method public int getUiAutomationFlags();
-    method public long getWaitForIdleTimeout();
-    method public long getWaitForSelectorTimeout();
-    method public androidx.test.uiautomator.Configurator setActionAcknowledgmentTimeout(long);
-    method public androidx.test.uiautomator.Configurator setKeyInjectionDelay(long);
-    method public androidx.test.uiautomator.Configurator setScrollAcknowledgmentTimeout(long);
-    method public androidx.test.uiautomator.Configurator setToolType(int);
-    method public androidx.test.uiautomator.Configurator setUiAutomationFlags(int);
-    method public androidx.test.uiautomator.Configurator setWaitForIdleTimeout(long);
-    method public androidx.test.uiautomator.Configurator setWaitForSelectorTimeout(long);
-  }
-
-  public enum Direction {
-    method public static androidx.test.uiautomator.Direction reverse(androidx.test.uiautomator.Direction);
-    enum_constant public static final androidx.test.uiautomator.Direction DOWN;
-    enum_constant public static final androidx.test.uiautomator.Direction LEFT;
-    enum_constant public static final androidx.test.uiautomator.Direction RIGHT;
-    enum_constant public static final androidx.test.uiautomator.Direction UP;
-  }
-
-  public abstract class EventCondition<U> implements android.app.UiAutomation.AccessibilityEventFilter {
-    ctor public EventCondition();
-    method public abstract U! getResult();
-  }
-
-  public interface IAutomationSupport {
-    method public void sendStatus(int, android.os.Bundle);
-  }
-
-  public abstract class SearchCondition<U> implements androidx.test.uiautomator.Condition<androidx.test.uiautomator.Searchable,U> {
-    ctor public SearchCondition();
-  }
-
-  public class StaleObjectException extends java.lang.RuntimeException {
-    ctor public StaleObjectException();
-  }
-
-  @Deprecated public class UiAutomatorInstrumentationTestRunner extends android.test.InstrumentationTestRunner {
-    ctor @Deprecated public UiAutomatorInstrumentationTestRunner();
-    method @Deprecated protected android.test.AndroidTestRunner! getAndroidTestRunner();
-    method @Deprecated protected void initializeUiAutomatorTest(androidx.test.uiautomator.UiAutomatorTestCase!);
-  }
-
-  @Deprecated public class UiAutomatorTestCase extends android.test.InstrumentationTestCase {
-    ctor @Deprecated public UiAutomatorTestCase();
-    method @Deprecated public androidx.test.uiautomator.IAutomationSupport! getAutomationSupport();
-    method @Deprecated public android.os.Bundle! getParams();
-    method @Deprecated public androidx.test.uiautomator.UiDevice! getUiDevice();
-    method @Deprecated public void sleep(long);
-  }
-
-  public class UiCollection extends androidx.test.uiautomator.UiObject {
-    ctor public UiCollection(androidx.test.uiautomator.UiSelector);
-    method public androidx.test.uiautomator.UiObject getChildByDescription(androidx.test.uiautomator.UiSelector, String) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getChildByInstance(androidx.test.uiautomator.UiSelector, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getChildByText(androidx.test.uiautomator.UiSelector, String) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public int getChildCount(androidx.test.uiautomator.UiSelector);
-  }
-
-  public class UiDevice {
-    method public void clearLastTraversedText();
-    method public boolean click(int, int);
-    method public boolean drag(int, int, int, int, int);
-    method public void dumpWindowHierarchy(java.io.File) throws java.io.IOException;
-    method public void dumpWindowHierarchy(java.io.OutputStream) throws java.io.IOException;
-    method @Deprecated public void dumpWindowHierarchy(String);
-    method public androidx.test.uiautomator.UiObject2! findObject(androidx.test.uiautomator.BySelector);
-    method public androidx.test.uiautomator.UiObject findObject(androidx.test.uiautomator.UiSelector);
-    method public java.util.List<androidx.test.uiautomator.UiObject2!> findObjects(androidx.test.uiautomator.BySelector);
-    method public void freezeRotation() throws android.os.RemoteException;
-    method @Deprecated public String! getCurrentActivityName();
-    method public String! getCurrentPackageName();
-    method public int getDisplayHeight();
-    method public int getDisplayRotation();
-    method public android.graphics.Point getDisplaySizeDp();
-    method public int getDisplayWidth();
-    method @Deprecated public static androidx.test.uiautomator.UiDevice getInstance();
-    method public static androidx.test.uiautomator.UiDevice getInstance(android.app.Instrumentation);
-    method public String! getLastTraversedText();
-    method public String! getLauncherPackageName();
-    method public String getProductName();
-    method public boolean hasAnyWatcherTriggered();
-    method public boolean hasObject(androidx.test.uiautomator.BySelector);
-    method public boolean hasWatcherTriggered(String?);
-    method public boolean isNaturalOrientation();
-    method public boolean isScreenOn() throws android.os.RemoteException;
-    method public boolean openNotification();
-    method public boolean openQuickSettings();
-    method public <U> U! performActionAndWait(Runnable, androidx.test.uiautomator.EventCondition<U!>, long);
-    method public boolean pressBack();
-    method public boolean pressDPadCenter();
-    method public boolean pressDPadDown();
-    method public boolean pressDPadLeft();
-    method public boolean pressDPadRight();
-    method public boolean pressDPadUp();
-    method public boolean pressDelete();
-    method public boolean pressEnter();
-    method public boolean pressHome();
-    method public boolean pressKeyCode(int);
-    method public boolean pressKeyCode(int, int);
-    method public boolean pressKeyCodes(int[]);
-    method public boolean pressKeyCodes(int[], int);
-    method public boolean pressMenu();
-    method public boolean pressRecentApps() throws android.os.RemoteException;
-    method public boolean pressSearch();
-    method public void registerWatcher(String?, androidx.test.uiautomator.UiWatcher?);
-    method public void removeWatcher(String?);
-    method public void resetWatcherTriggers();
-    method public void runWatchers();
-    method @Deprecated public void setCompressedLayoutHeirarchy(boolean);
-    method public void setCompressedLayoutHierarchy(boolean);
-    method public void setOrientationLandscape() throws android.os.RemoteException;
-    method public void setOrientationLeft() throws android.os.RemoteException;
-    method public void setOrientationNatural() throws android.os.RemoteException;
-    method public void setOrientationPortrait() throws android.os.RemoteException;
-    method public void setOrientationRight() throws android.os.RemoteException;
-    method public void sleep() throws android.os.RemoteException;
-    method public boolean swipe(android.graphics.Point![], int);
-    method public boolean swipe(int, int, int, int, int);
-    method public boolean takeScreenshot(java.io.File);
-    method public boolean takeScreenshot(java.io.File, float, int);
-    method public void unfreezeRotation() throws android.os.RemoteException;
-    method public <U> U! wait(androidx.test.uiautomator.Condition<? super androidx.test.uiautomator.UiDevice,U!>, long);
-    method public void waitForIdle();
-    method public void waitForIdle(long);
-    method public boolean waitForWindowUpdate(String?, long);
-    method public void wakeUp() throws android.os.RemoteException;
-  }
-
-  public class UiObject {
-    ctor @Deprecated public UiObject(androidx.test.uiautomator.UiSelector!);
-    method public void clearTextField() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean click() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean clickAndWaitForNewWindow() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean clickAndWaitForNewWindow(long) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean clickBottomRight() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean clickTopLeft() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean dragTo(androidx.test.uiautomator.UiObject, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean dragTo(int, int, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean exists();
-    method protected android.view.accessibility.AccessibilityNodeInfo? findAccessibilityNodeInfo(long);
-    method public android.graphics.Rect getBounds() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getChild(androidx.test.uiautomator.UiSelector) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public int getChildCount() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public String getClassName() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public String getContentDescription() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getFromParent(androidx.test.uiautomator.UiSelector) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public String getPackageName() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public final androidx.test.uiautomator.UiSelector getSelector();
-    method public String getText() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public android.graphics.Rect getVisibleBounds() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isCheckable() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isChecked() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isClickable() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isEnabled() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isFocusable() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isFocused() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isLongClickable() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isScrollable() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean isSelected() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean longClick() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean longClickBottomRight() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean longClickTopLeft() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean performMultiPointerGesture(android.view.MotionEvent.PointerCoords![]!...);
-    method public boolean performTwoPointerGesture(android.graphics.Point, android.graphics.Point, android.graphics.Point, android.graphics.Point, int);
-    method public boolean pinchIn(int, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean pinchOut(int, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean setText(String?) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean swipeDown(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean swipeLeft(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean swipeRight(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean swipeUp(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean waitForExists(long);
-    method public boolean waitUntilGone(long);
-    field protected static final int FINGER_TOUCH_HALF_WIDTH = 20; // 0x14
-    field protected static final int SWIPE_MARGIN_LIMIT = 5; // 0x5
-    field @Deprecated protected static final long WAIT_FOR_EVENT_TMEOUT = 3000L; // 0xbb8L
-    field protected static final long WAIT_FOR_SELECTOR_POLL = 1000L; // 0x3e8L
-    field @Deprecated protected static final long WAIT_FOR_SELECTOR_TIMEOUT = 10000L; // 0x2710L
-    field protected static final long WAIT_FOR_WINDOW_TMEOUT = 5500L; // 0x157cL
-  }
-
-  public class UiObject2 {
-    method public void clear();
-    method public void click();
-    method public void click(android.graphics.Point);
-    method public void click(android.graphics.Point, long);
-    method public void click(long);
-    method public <U> U! clickAndWait(android.graphics.Point, androidx.test.uiautomator.EventCondition<U!>, long);
-    method public <U> U! clickAndWait(androidx.test.uiautomator.EventCondition<U!>, long);
-    method public void drag(android.graphics.Point);
-    method public void drag(android.graphics.Point, int);
-    method public androidx.test.uiautomator.UiObject2! findObject(androidx.test.uiautomator.BySelector);
-    method public java.util.List<androidx.test.uiautomator.UiObject2!> findObjects(androidx.test.uiautomator.BySelector);
-    method public boolean fling(androidx.test.uiautomator.Direction);
-    method public boolean fling(androidx.test.uiautomator.Direction, int);
-    method public String! getApplicationPackage();
-    method public int getChildCount();
-    method public java.util.List<androidx.test.uiautomator.UiObject2!> getChildren();
-    method public String! getClassName();
-    method public String! getContentDescription();
-    method public int getDisplayId();
-    method @RequiresApi(26) public String? getHint();
-    method public androidx.test.uiautomator.UiObject2! getParent();
-    method public String! getResourceName();
-    method public String! getText();
-    method public android.graphics.Rect getVisibleBounds();
-    method public android.graphics.Point getVisibleCenter();
-    method public boolean hasObject(androidx.test.uiautomator.BySelector);
-    method public boolean isCheckable();
-    method public boolean isChecked();
-    method public boolean isClickable();
-    method public boolean isEnabled();
-    method public boolean isFocusable();
-    method public boolean isFocused();
-    method public boolean isLongClickable();
-    method public boolean isScrollable();
-    method public boolean isSelected();
-    method public void longClick();
-    method public void pinchClose(float);
-    method public void pinchClose(float, int);
-    method public void pinchOpen(float);
-    method public void pinchOpen(float, int);
-    method public void recycle();
-    method public boolean scroll(androidx.test.uiautomator.Direction, float);
-    method public boolean scroll(androidx.test.uiautomator.Direction, float, int);
-    method public <U> U! scrollUntil(androidx.test.uiautomator.Direction, androidx.test.uiautomator.Condition<? super androidx.test.uiautomator.UiObject2,U!>);
-    method public <U> U! scrollUntil(androidx.test.uiautomator.Direction, androidx.test.uiautomator.EventCondition<U!>);
-    method public void setGestureMargin(int);
-    method public void setGestureMarginPercent(@FloatRange(from=0.0f, to=0.5f) float);
-    method public void setGestureMarginPercent(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=0.0f, to=1.0f) float);
-    method public void setGestureMargins(int, int, int, int);
-    method public void setText(String?);
-    method public void swipe(androidx.test.uiautomator.Direction, float);
-    method public void swipe(androidx.test.uiautomator.Direction, float, int);
-    method public <U> U! wait(androidx.test.uiautomator.Condition<? super androidx.test.uiautomator.UiObject2,U!>, long);
-  }
-
-  public abstract class UiObject2Condition<U> implements androidx.test.uiautomator.Condition<androidx.test.uiautomator.UiObject2,U> {
-    ctor public UiObject2Condition();
-  }
-
-  public class UiObjectNotFoundException extends java.lang.Exception {
-    ctor public UiObjectNotFoundException(String);
-    ctor public UiObjectNotFoundException(String, Throwable?);
-    ctor public UiObjectNotFoundException(Throwable?);
-  }
-
-  public class UiScrollable extends androidx.test.uiautomator.UiCollection {
-    ctor public UiScrollable(androidx.test.uiautomator.UiSelector);
-    method protected boolean exists(androidx.test.uiautomator.UiSelector);
-    method public boolean flingBackward() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean flingForward() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean flingToBeginning(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean flingToEnd(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getChildByDescription(androidx.test.uiautomator.UiSelector, String, boolean) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiObject getChildByText(androidx.test.uiautomator.UiSelector, String, boolean) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public int getMaxSearchSwipes();
-    method public double getSwipeDeadZonePercentage();
-    method public boolean scrollBackward() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollBackward(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollDescriptionIntoView(String) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollForward() throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollForward(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollIntoView(androidx.test.uiautomator.UiObject) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollIntoView(androidx.test.uiautomator.UiSelector) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollTextIntoView(String) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollToBeginning(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollToBeginning(int, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollToEnd(int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public boolean scrollToEnd(int, int) throws androidx.test.uiautomator.UiObjectNotFoundException;
-    method public androidx.test.uiautomator.UiScrollable setAsHorizontalList();
-    method public androidx.test.uiautomator.UiScrollable setAsVerticalList();
-    method public androidx.test.uiautomator.UiScrollable setMaxSearchSwipes(int);
-    method public androidx.test.uiautomator.UiScrollable setSwipeDeadZonePercentage(double);
-  }
-
-  public class UiSelector {
-    ctor public UiSelector();
-    method public androidx.test.uiautomator.UiSelector checkable(boolean);
-    method public androidx.test.uiautomator.UiSelector checked(boolean);
-    method public androidx.test.uiautomator.UiSelector childSelector(androidx.test.uiautomator.UiSelector);
-    method public <T> androidx.test.uiautomator.UiSelector className(Class<T!>);
-    method public androidx.test.uiautomator.UiSelector className(String);
-    method public androidx.test.uiautomator.UiSelector classNameMatches(String);
-    method public androidx.test.uiautomator.UiSelector clickable(boolean);
-    method protected androidx.test.uiautomator.UiSelector cloneSelector();
-    method public androidx.test.uiautomator.UiSelector description(String);
-    method public androidx.test.uiautomator.UiSelector descriptionContains(String);
-    method public androidx.test.uiautomator.UiSelector descriptionMatches(String);
-    method public androidx.test.uiautomator.UiSelector descriptionStartsWith(String);
-    method public androidx.test.uiautomator.UiSelector enabled(boolean);
-    method public androidx.test.uiautomator.UiSelector focusable(boolean);
-    method public androidx.test.uiautomator.UiSelector focused(boolean);
-    method public androidx.test.uiautomator.UiSelector fromParent(androidx.test.uiautomator.UiSelector);
-    method public androidx.test.uiautomator.UiSelector index(int);
-    method public androidx.test.uiautomator.UiSelector instance(int);
-    method public androidx.test.uiautomator.UiSelector longClickable(boolean);
-    method public androidx.test.uiautomator.UiSelector packageName(String);
-    method public androidx.test.uiautomator.UiSelector packageNameMatches(String);
-    method public androidx.test.uiautomator.UiSelector resourceId(String);
-    method public androidx.test.uiautomator.UiSelector resourceIdMatches(String);
-    method public androidx.test.uiautomator.UiSelector scrollable(boolean);
-    method public androidx.test.uiautomator.UiSelector selected(boolean);
-    method public androidx.test.uiautomator.UiSelector text(String);
-    method public androidx.test.uiautomator.UiSelector textContains(String);
-    method public androidx.test.uiautomator.UiSelector textMatches(String);
-    method public androidx.test.uiautomator.UiSelector textStartsWith(String);
-  }
-
-  public interface UiWatcher {
-    method public boolean checkForCondition();
-  }
-
-  public class Until {
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> checkable(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> checked(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> clickable(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descContains(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descEndsWith(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descEquals(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descMatches(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descMatches(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> descStartsWith(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> enabled(boolean);
-    method public static androidx.test.uiautomator.SearchCondition<androidx.test.uiautomator.UiObject2!> findObject(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.SearchCondition<java.util.List<androidx.test.uiautomator.UiObject2!>!> findObjects(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> focusable(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> focused(boolean);
-    method public static androidx.test.uiautomator.SearchCondition<java.lang.Boolean!> gone(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.SearchCondition<java.lang.Boolean!> hasObject(androidx.test.uiautomator.BySelector);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> longClickable(boolean);
-    method public static androidx.test.uiautomator.EventCondition<java.lang.Boolean!> newWindow();
-    method public static androidx.test.uiautomator.EventCondition<java.lang.Boolean!> scrollFinished(androidx.test.uiautomator.Direction);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> scrollable(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> selected(boolean);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textContains(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textEndsWith(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textEquals(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textMatches(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textMatches(java.util.regex.Pattern);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textNotEquals(String);
-    method public static androidx.test.uiautomator.UiObject2Condition<java.lang.Boolean!> textStartsWith(String);
-  }
-
-}
-
diff --git a/tracing/tracing-ktx/api/public_plus_experimental_1.2.0-beta04.txt b/tracing/tracing-ktx/api/public_plus_experimental_1.2.0-beta04.txt
deleted file mode 100644
index c866186..0000000
--- a/tracing/tracing-ktx/api/public_plus_experimental_1.2.0-beta04.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing {
-
-  public final class TraceKt {
-    method public static inline <T> T trace(String label, kotlin.jvm.functions.Function0<? extends T> block);
-    method public static inline <T> T trace(kotlin.jvm.functions.Function0<java.lang.String> lazyLabel, kotlin.jvm.functions.Function0<? extends T> block);
-    method public static suspend inline <T> Object? traceAsync(String methodName, int cookie, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method public static inline <T> T traceAsync(kotlin.jvm.functions.Function0<java.lang.String> lazyMethodName, kotlin.jvm.functions.Function0<java.lang.Integer> lazyCookie, kotlin.jvm.functions.Function0<? extends T> block);
-  }
-
-}
-
diff --git a/tracing/tracing-ktx/api/public_plus_experimental_current.txt b/tracing/tracing-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index c866186..0000000
--- a/tracing/tracing-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing {
-
-  public final class TraceKt {
-    method public static inline <T> T trace(String label, kotlin.jvm.functions.Function0<? extends T> block);
-    method public static inline <T> T trace(kotlin.jvm.functions.Function0<java.lang.String> lazyLabel, kotlin.jvm.functions.Function0<? extends T> block);
-    method public static suspend inline <T> Object? traceAsync(String methodName, int cookie, kotlin.jvm.functions.Function1<? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method public static inline <T> T traceAsync(kotlin.jvm.functions.Function0<java.lang.String> lazyMethodName, kotlin.jvm.functions.Function0<java.lang.Integer> lazyCookie, kotlin.jvm.functions.Function0<? extends T> block);
-  }
-
-}
-
diff --git a/tracing/tracing-perfetto-binary/api/public_plus_experimental_current.txt b/tracing/tracing-perfetto-binary/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/tracing/tracing-perfetto-binary/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/tracing/tracing-perfetto-common/api/public_plus_experimental_current.txt b/tracing/tracing-perfetto-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index 6615b79..0000000
--- a/tracing/tracing-perfetto-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing.perfetto {
-
-  public final class PerfettoHandshake {
-    ctor public PerfettoHandshake(String targetPackage, kotlin.jvm.functions.Function1<? super java.lang.String,? extends java.util.Map<java.lang.String,java.lang.String>> parseJsonMap, kotlin.jvm.functions.Function1<? super java.lang.String,java.lang.String> executeShellCommand);
-    method public androidx.tracing.perfetto.PerfettoHandshake.EnableTracingResponse enableTracing(optional androidx.tracing.perfetto.PerfettoHandshake.ExternalLibraryProvider? libraryProvider);
-  }
-
-  public static final class PerfettoHandshake.EnableTracingResponse {
-    method public int getExitCode();
-    method public String? getMessage();
-    method public String? getRequiredVersion();
-    property public final int exitCode;
-    property public final String? message;
-    property public final String? requiredVersion;
-  }
-
-  public static final class PerfettoHandshake.ExternalLibraryProvider {
-    ctor public PerfettoHandshake.ExternalLibraryProvider(java.io.File libraryZip, java.io.File tempDirectory, kotlin.jvm.functions.Function2<? super java.io.File,? super java.io.File,kotlin.Unit> moveTempDirectoryFileToDestination);
-  }
-
-  public static final class PerfettoHandshake.ResponseExitCodes {
-    field public static final androidx.tracing.perfetto.PerfettoHandshake.ResponseExitCodes INSTANCE;
-    field public static final int RESULT_CODE_ALREADY_ENABLED = 2; // 0x2
-    field public static final int RESULT_CODE_CANCELLED = 0; // 0x0
-    field public static final int RESULT_CODE_ERROR_BINARY_MISSING = 11; // 0xb
-    field public static final int RESULT_CODE_ERROR_BINARY_VERIFICATION_ERROR = 13; // 0xd
-    field public static final int RESULT_CODE_ERROR_BINARY_VERSION_MISMATCH = 12; // 0xc
-    field public static final int RESULT_CODE_ERROR_OTHER = 99; // 0x63
-    field public static final int RESULT_CODE_SUCCESS = 1; // 0x1
-  }
-
-}
-
diff --git a/tracing/tracing-perfetto/api/public_plus_experimental_current.txt b/tracing/tracing-perfetto/api/public_plus_experimental_current.txt
deleted file mode 100644
index 4d8a122..0000000
--- a/tracing/tracing-perfetto/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing.perfetto {
-
-  public final class Tracing {
-    method public boolean isEnabled();
-    method public void traceEventEnd();
-    method public void traceEventStart(int key, String traceInfo);
-    property public final boolean isEnabled;
-    field public static final androidx.tracing.perfetto.Tracing INSTANCE;
-  }
-
-}
-
diff --git a/tracing/tracing/api/public_plus_experimental_1.2.0-beta04.txt b/tracing/tracing/api/public_plus_experimental_1.2.0-beta04.txt
deleted file mode 100644
index c883da2..0000000
--- a/tracing/tracing/api/public_plus_experimental_1.2.0-beta04.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing {
-
-  public final class Trace {
-    method public static void beginAsyncSection(String, int);
-    method public static void beginSection(String);
-    method public static void endAsyncSection(String, int);
-    method public static void endSection();
-    method public static void forceEnableAppTracing();
-    method public static boolean isEnabled();
-    method public static void setCounter(String, int);
-  }
-
-}
-
diff --git a/tracing/tracing/api/public_plus_experimental_current.txt b/tracing/tracing/api/public_plus_experimental_current.txt
deleted file mode 100644
index c883da2..0000000
--- a/tracing/tracing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Signature format: 4.0
-package androidx.tracing {
-
-  public final class Trace {
-    method public static void beginAsyncSection(String, int);
-    method public static void beginSection(String);
-    method public static void endAsyncSection(String, int);
-    method public static void endSection();
-    method public static void forceEnableAppTracing();
-    method public static boolean isEnabled();
-    method public static void setCounter(String, int);
-  }
-
-}
-
diff --git a/transition/transition-ktx/api/public_plus_experimental_current.txt b/transition/transition-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 8ef2d243..0000000
--- a/transition/transition-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Signature format: 4.0
-package androidx.transition {
-
-  public final class TransitionKt {
-    method public static inline androidx.transition.Transition.TransitionListener addListener(androidx.transition.Transition, optional kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onEnd, optional kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onStart, optional kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onCancel, optional kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onResume, optional kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> onPause);
-    method public static inline androidx.transition.Transition.TransitionListener doOnCancel(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
-    method public static inline androidx.transition.Transition.TransitionListener doOnEnd(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
-    method public static inline androidx.transition.Transition.TransitionListener doOnPause(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
-    method public static inline androidx.transition.Transition.TransitionListener doOnResume(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
-    method public static inline androidx.transition.Transition.TransitionListener doOnStart(androidx.transition.Transition, kotlin.jvm.functions.Function1<? super androidx.transition.Transition,kotlin.Unit> action);
-  }
-
-}
-
diff --git a/tv/tv-foundation/api/current.txt b/tv/tv-foundation/api/current.txt
index c79791e..41b7269 100644
--- a/tv/tv-foundation/api/current.txt
+++ b/tv/tv-foundation/api/current.txt
@@ -1,6 +1,9 @@
 // Signature format: 4.0
 package androidx.tv.foundation {
 
+  @kotlin.RequiresOptIn(message="This tv-foundation API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvFoundationApi {
+  }
+
   @androidx.compose.runtime.Immutable public final class PivotOffsets {
     ctor public PivotOffsets(optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float parentFraction, optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float childFraction);
     method public float getChildFraction();
@@ -9,6 +12,10 @@
     property public final float parentFraction;
   }
 
+  public final class ScrollableWithPivotKt {
+    method @androidx.tv.foundation.ExperimentalTvFoundationApi public static androidx.compose.ui.Modifier scrollableWithPivot(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.tv.foundation.PivotOffsets pivotOffsets, optional boolean enabled, optional boolean reverseDirection);
+  }
+
 }
 
 package androidx.tv.foundation.lazy.grid {
@@ -42,6 +49,7 @@
 
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TvGridItemSpan {
     method public int getCurrentLineSpan();
+    property @androidx.compose.foundation.ExperimentalFoundationApi public final int currentLineSpan;
   }
 
   public sealed interface TvLazyGridItemInfo {
@@ -68,6 +76,7 @@
   }
 
   @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemScope {
+    method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
   }
 
   @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemSpanScope {
@@ -167,6 +176,7 @@
   }
 
   @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListItemScope {
+    method @androidx.compose.foundation.ExperimentalFoundationApi public 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);
@@ -198,6 +208,7 @@
   @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListScope {
     method public void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+    method @androidx.tv.foundation.ExperimentalTvFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
   }
 
   @kotlin.DslMarker public @interface TvLazyListScopeMarker {
diff --git a/tv/tv-foundation/api/public_plus_experimental_current.txt b/tv/tv-foundation/api/public_plus_experimental_current.txt
deleted file mode 100644
index 41b7269..0000000
--- a/tv/tv-foundation/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,244 +0,0 @@
-// Signature format: 4.0
-package androidx.tv.foundation {
-
-  @kotlin.RequiresOptIn(message="This tv-foundation API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvFoundationApi {
-  }
-
-  @androidx.compose.runtime.Immutable public final class PivotOffsets {
-    ctor public PivotOffsets(optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float parentFraction, optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float childFraction);
-    method public float getChildFraction();
-    method public float getParentFraction();
-    property public final float childFraction;
-    property public final float parentFraction;
-  }
-
-  public final class ScrollableWithPivotKt {
-    method @androidx.tv.foundation.ExperimentalTvFoundationApi public static androidx.compose.ui.Modifier scrollableWithPivot(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.tv.foundation.PivotOffsets pivotOffsets, optional boolean enabled, optional boolean reverseDirection);
-  }
-
-}
-
-package androidx.tv.foundation.lazy.grid {
-
-  public final class LazyGridDslKt {
-    method @androidx.compose.runtime.Composable public static void TvLazyHorizontalGrid(androidx.tv.foundation.lazy.grid.TvGridCells rows, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.grid.TvLazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.grid.TvLazyGridScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void TvLazyVerticalGrid(androidx.tv.foundation.lazy.grid.TvGridCells columns, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.grid.TvLazyGridState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.grid.TvLazyGridScope,kotlin.Unit> content);
-    method public static inline <T> void items(androidx.tv.foundation.lazy.grid.TvLazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void items(androidx.tv.foundation.lazy.grid.TvLazyGridScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.grid.TvLazyGridScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.grid.TvLazyGridScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,? super T,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
-  }
-
-  public final class LazyGridSpanKt {
-    method public static long TvGridItemSpan(int currentLineSpan);
-  }
-
-  @androidx.compose.runtime.Stable public interface TvGridCells {
-    method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
-  }
-
-  public static final class TvGridCells.Adaptive implements androidx.tv.foundation.lazy.grid.TvGridCells {
-    ctor public TvGridCells.Adaptive(float minSize);
-    method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
-  }
-
-  public static final class TvGridCells.Fixed implements androidx.tv.foundation.lazy.grid.TvGridCells {
-    ctor public TvGridCells.Fixed(int count);
-    method public java.util.List<java.lang.Integer> calculateCrossAxisCellSizes(androidx.compose.ui.unit.Density, int availableSize, int spacing);
-  }
-
-  @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TvGridItemSpan {
-    method public int getCurrentLineSpan();
-    property @androidx.compose.foundation.ExperimentalFoundationApi public final int currentLineSpan;
-  }
-
-  public sealed interface TvLazyGridItemInfo {
-    method public int getColumn();
-    method public int getIndex();
-    method public Object getKey();
-    method public long getOffset();
-    method public int getRow();
-    method public long getSize();
-    property public abstract int column;
-    property public abstract int index;
-    property public abstract Object key;
-    property public abstract long offset;
-    property public abstract int row;
-    property public abstract long size;
-    field public static final androidx.tv.foundation.lazy.grid.TvLazyGridItemInfo.Companion Companion;
-    field public static final int UnknownColumn = -1; // 0xffffffff
-    field public static final int UnknownRow = -1; // 0xffffffff
-  }
-
-  public static final class TvLazyGridItemInfo.Companion {
-    field public static final int UnknownColumn = -1; // 0xffffffff
-    field public static final int UnknownRow = -1; // 0xffffffff
-  }
-
-  @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemScope {
-    method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
-  }
-
-  @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemSpanScope {
-    method public int getMaxCurrentLineSpan();
-    method public int getMaxLineSpan();
-    property public abstract int maxCurrentLineSpan;
-    property public abstract int maxLineSpan;
-  }
-
-  public sealed interface TvLazyGridLayoutInfo {
-    method public int getAfterContentPadding();
-    method public int getBeforeContentPadding();
-    method public int getMainAxisItemSpacing();
-    method public androidx.compose.foundation.gestures.Orientation getOrientation();
-    method public boolean getReverseLayout();
-    method public int getTotalItemsCount();
-    method public int getViewportEndOffset();
-    method public long getViewportSize();
-    method public int getViewportStartOffset();
-    method public java.util.List<androidx.tv.foundation.lazy.grid.TvLazyGridItemInfo> getVisibleItemsInfo();
-    property public abstract int afterContentPadding;
-    property public abstract int beforeContentPadding;
-    property public abstract int mainAxisItemSpacing;
-    property public abstract androidx.compose.foundation.gestures.Orientation orientation;
-    property public abstract boolean reverseLayout;
-    property public abstract int totalItemsCount;
-    property public abstract int viewportEndOffset;
-    property public abstract long viewportSize;
-    property public abstract int viewportStartOffset;
-    property public abstract java.util.List<androidx.tv.foundation.lazy.grid.TvLazyGridItemInfo> visibleItemsInfo;
-  }
-
-  @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridScope {
-    method public void item(optional Object? key, optional kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,kotlin.Unit> content);
-    method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemSpanScope,? super java.lang.Integer,androidx.tv.foundation.lazy.grid.TvGridItemSpan>? span, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.grid.TvLazyGridItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
-  }
-
-  @kotlin.DslMarker public @interface TvLazyGridScopeMarker {
-  }
-
-  @androidx.compose.runtime.Stable public final class TvLazyGridState implements androidx.compose.foundation.gestures.ScrollableState {
-    ctor public TvLazyGridState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
-    method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public float dispatchRawDelta(float delta);
-    method public int getFirstVisibleItemIndex();
-    method public int getFirstVisibleItemScrollOffset();
-    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
-    method public androidx.tv.foundation.lazy.grid.TvLazyGridLayoutInfo getLayoutInfo();
-    method public boolean isScrollInProgress();
-    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>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    property public boolean canScrollBackward;
-    property public boolean canScrollForward;
-    property public final int firstVisibleItemIndex;
-    property public final int firstVisibleItemScrollOffset;
-    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
-    property public boolean isScrollInProgress;
-    property public final androidx.tv.foundation.lazy.grid.TvLazyGridLayoutInfo layoutInfo;
-    field public static final androidx.tv.foundation.lazy.grid.TvLazyGridState.Companion Companion;
-  }
-
-  public static final class TvLazyGridState.Companion {
-    method public androidx.compose.runtime.saveable.Saver<androidx.tv.foundation.lazy.grid.TvLazyGridState,?> getSaver();
-    property public final androidx.compose.runtime.saveable.Saver<androidx.tv.foundation.lazy.grid.TvLazyGridState,?> Saver;
-  }
-
-  public final class TvLazyGridStateKt {
-    method @androidx.compose.runtime.Composable public static androidx.tv.foundation.lazy.grid.TvLazyGridState rememberTvLazyGridState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
-  }
-
-}
-
-package androidx.tv.foundation.lazy.list {
-
-  public final class LazyDslKt {
-    method @androidx.compose.runtime.Composable public static void TvLazyColumn(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void TvLazyRow(optional androidx.compose.ui.Modifier modifier, optional androidx.tv.foundation.lazy.list.TvLazyListState state, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional boolean reverseLayout, optional androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement, optional androidx.compose.ui.Alignment.Vertical verticalAlignment, optional boolean userScrollEnabled, optional androidx.tv.foundation.PivotOffsets pivotOffsets, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListScope,kotlin.Unit> content);
-    method public static inline <T> void items(androidx.tv.foundation.lazy.list.TvLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void items(androidx.tv.foundation.lazy.list.TvLazyListScope, T![] items, optional kotlin.jvm.functions.Function1<? super T,?>? key, optional kotlin.jvm.functions.Function1<? super T,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.list.TvLazyListScope, java.util.List<? extends T> items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
-    method public static inline <T> void itemsIndexed(androidx.tv.foundation.lazy.list.TvLazyListScope, T![] items, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?>? key, optional kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,?> contentType, kotlin.jvm.functions.Function3<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,? super T,kotlin.Unit> itemContent);
-  }
-
-  public final class LazyListStateKt {
-    method @androidx.compose.runtime.Composable public static androidx.tv.foundation.lazy.list.TvLazyListState rememberTvLazyListState(optional int initialFirstVisibleItemIndex, optional int initialFirstVisibleItemScrollOffset);
-  }
-
-  public interface TvLazyListItemInfo {
-    method public int getIndex();
-    method public Object getKey();
-    method public int getOffset();
-    method public int getSize();
-    property public abstract int index;
-    property public abstract Object key;
-    property public abstract int offset;
-    property public abstract int size;
-  }
-
-  @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListItemScope {
-    method @androidx.compose.foundation.ExperimentalFoundationApi public 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);
-  }
-
-  public sealed interface TvLazyListLayoutInfo {
-    method public int getAfterContentPadding();
-    method public int getBeforeContentPadding();
-    method public int getMainAxisItemSpacing();
-    method public androidx.compose.foundation.gestures.Orientation getOrientation();
-    method public boolean getReverseLayout();
-    method public int getTotalItemsCount();
-    method public int getViewportEndOffset();
-    method public long getViewportSize();
-    method public int getViewportStartOffset();
-    method public java.util.List<androidx.tv.foundation.lazy.list.TvLazyListItemInfo> getVisibleItemsInfo();
-    property public abstract int afterContentPadding;
-    property public abstract int beforeContentPadding;
-    property public abstract int mainAxisItemSpacing;
-    property public abstract androidx.compose.foundation.gestures.Orientation orientation;
-    property public abstract boolean reverseLayout;
-    property public abstract int totalItemsCount;
-    property public abstract int viewportEndOffset;
-    property public abstract long viewportSize;
-    property public abstract int viewportStartOffset;
-    property public abstract java.util.List<androidx.tv.foundation.lazy.list.TvLazyListItemInfo> visibleItemsInfo;
-  }
-
-  @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListScope {
-    method public void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
-    method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
-    method @androidx.tv.foundation.ExperimentalTvFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
-  }
-
-  @kotlin.DslMarker public @interface TvLazyListScopeMarker {
-  }
-
-  @androidx.compose.runtime.Stable public final class TvLazyListState implements androidx.compose.foundation.gestures.ScrollableState {
-    ctor public TvLazyListState(optional int firstVisibleItemIndex, optional int firstVisibleItemScrollOffset);
-    method public suspend Object? animateScrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public float dispatchRawDelta(float delta);
-    method public int getFirstVisibleItemIndex();
-    method public int getFirstVisibleItemScrollOffset();
-    method public androidx.compose.foundation.interaction.InteractionSource getInteractionSource();
-    method public androidx.tv.foundation.lazy.list.TvLazyListLayoutInfo getLayoutInfo();
-    method public boolean isScrollInProgress();
-    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>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public suspend Object? scrollToItem(int index, optional int scrollOffset, optional kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    property public boolean canScrollBackward;
-    property public boolean canScrollForward;
-    property public final int firstVisibleItemIndex;
-    property public final int firstVisibleItemScrollOffset;
-    property public final androidx.compose.foundation.interaction.InteractionSource interactionSource;
-    property public boolean isScrollInProgress;
-    property public final androidx.tv.foundation.lazy.list.TvLazyListLayoutInfo layoutInfo;
-    field public static final androidx.tv.foundation.lazy.list.TvLazyListState.Companion Companion;
-  }
-
-  public static final class TvLazyListState.Companion {
-    method public androidx.compose.runtime.saveable.Saver<androidx.tv.foundation.lazy.list.TvLazyListState,?> getSaver();
-    property public final androidx.compose.runtime.saveable.Saver<androidx.tv.foundation.lazy.list.TvLazyListState,?> Saver;
-  }
-
-}
-
diff --git a/tv/tv-foundation/api/restricted_current.txt b/tv/tv-foundation/api/restricted_current.txt
index c79791e..41b7269 100644
--- a/tv/tv-foundation/api/restricted_current.txt
+++ b/tv/tv-foundation/api/restricted_current.txt
@@ -1,6 +1,9 @@
 // Signature format: 4.0
 package androidx.tv.foundation {
 
+  @kotlin.RequiresOptIn(message="This tv-foundation API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvFoundationApi {
+  }
+
   @androidx.compose.runtime.Immutable public final class PivotOffsets {
     ctor public PivotOffsets(optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float parentFraction, optional @FloatRange(from=0.0, to=1.0, fromInclusive=true, toInclusive=true) float childFraction);
     method public float getChildFraction();
@@ -9,6 +12,10 @@
     property public final float parentFraction;
   }
 
+  public final class ScrollableWithPivotKt {
+    method @androidx.tv.foundation.ExperimentalTvFoundationApi public static androidx.compose.ui.Modifier scrollableWithPivot(androidx.compose.ui.Modifier, androidx.compose.foundation.gestures.ScrollableState state, androidx.compose.foundation.gestures.Orientation orientation, androidx.tv.foundation.PivotOffsets pivotOffsets, optional boolean enabled, optional boolean reverseDirection);
+  }
+
 }
 
 package androidx.tv.foundation.lazy.grid {
@@ -42,6 +49,7 @@
 
   @androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TvGridItemSpan {
     method public int getCurrentLineSpan();
+    property @androidx.compose.foundation.ExperimentalFoundationApi public final int currentLineSpan;
   }
 
   public sealed interface TvLazyGridItemInfo {
@@ -68,6 +76,7 @@
   }
 
   @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemScope {
+    method @androidx.compose.foundation.ExperimentalFoundationApi public androidx.compose.ui.Modifier animateItemPlacement(androidx.compose.ui.Modifier, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec);
   }
 
   @androidx.tv.foundation.lazy.grid.TvLazyGridScopeMarker public sealed interface TvLazyGridItemSpanScope {
@@ -167,6 +176,7 @@
   }
 
   @androidx.compose.runtime.Stable @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListItemScope {
+    method @androidx.compose.foundation.ExperimentalFoundationApi public 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);
@@ -198,6 +208,7 @@
   @androidx.tv.foundation.lazy.list.TvLazyListScopeMarker public sealed interface TvLazyListScope {
     method public void item(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
     method public void items(int count, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?>? key, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,?> contentType, kotlin.jvm.functions.Function2<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,? super java.lang.Integer,kotlin.Unit> itemContent);
+    method @androidx.tv.foundation.ExperimentalTvFoundationApi public void stickyHeader(optional Object? key, optional Object? contentType, kotlin.jvm.functions.Function1<? super androidx.tv.foundation.lazy.list.TvLazyListItemScope,kotlin.Unit> content);
   }
 
   @kotlin.DslMarker public @interface TvLazyListScopeMarker {
diff --git a/tv/tv-material/api/current.txt b/tv/tv-material/api/current.txt
index dea09db..9fa65e0 100644
--- a/tv/tv-material/api/current.txt
+++ b/tv/tv-material/api/current.txt
@@ -1,20 +1,424 @@
 // Signature format: 4.0
 package androidx.tv.material3 {
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Border {
+    ctor public Border(androidx.compose.foundation.BorderStroke border, optional float inset, optional androidx.compose.ui.graphics.Shape shape);
+    method public androidx.tv.material3.Border copy(optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.ui.unit.Dp? inset, optional androidx.compose.ui.graphics.Shape? shape);
+    method public androidx.compose.foundation.BorderStroke getBorder();
+    method public float getInset();
+    method public androidx.compose.ui.graphics.Shape getShape();
+    property public final androidx.compose.foundation.BorderStroke border;
+    property public final float inset;
+    property public final androidx.compose.ui.graphics.Shape shape;
+    field public static final androidx.tv.material3.Border.Companion Companion;
+  }
+
+  public static final class Border.Companion {
+    method public androidx.tv.material3.Border getNone();
+    property public final androidx.tv.material3.Border None;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize();
+    method public float getIconSpacing();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    field public static final androidx.tv.material3.ButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonGlow {
+  }
+
+  public final class ButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonShape {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors compactCardColors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
+    method public androidx.compose.ui.graphics.Brush getContainerGradient();
+    method public androidx.tv.material3.CardGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.CardScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale);
+    method public androidx.tv.material3.CardShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape);
+    property public final androidx.compose.ui.graphics.Brush ContainerGradient;
+    field public static final float HorizontalImageAspectRatio = 1.7777778f;
+    field public static final androidx.tv.material3.CardDefaults INSTANCE;
+    field public static final float SquareImageAspectRatio = 1.0f;
+    field public static final float VerticalImageAspectRatio = 0.6666667f;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardGlow {
+  }
+
+  public final class CardKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void CompactCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.ui.graphics.Brush scrimBrush, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutDefaults {
+    method @androidx.compose.runtime.Composable public void ImageCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardLayoutColors contentColor(optional long contentColor, optional long focusedContentColor, optional long pressedContentColor);
+    field public static final androidx.tv.material3.CardLayoutDefaults INSTANCE;
+  }
+
+  public final class CardLayoutKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void StandardCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardShape {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public void IndicatorRow(int itemCount, int activeItemIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
+    method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
+    property @androidx.compose.runtime.Composable public final androidx.compose.animation.ContentTransform contentTransform;
+    field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
+    field public static final long TimeToDisplayItemMillis = 5000L; // 0x1388L
+  }
+
+  public final class CarouselKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Carousel(int itemCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CarouselState carouselState, optional long autoScrollDurationMillis, optional androidx.compose.animation.ContentTransform contentTransformStartToEnd, optional androidx.compose.animation.ContentTransform contentTransformEndToStart, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedContentScope,? super java.lang.Integer,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselState {
+    ctor public CarouselState(optional int initialActiveItemIndex);
+    method public int getActiveItemIndex();
+    method public androidx.tv.material3.ScrollPauseHandle pauseAutoScroll(int itemIndex);
+    property public final int activeItemIndex;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledCheckedColor, optional long disabledUncheckedColor, optional long disabledIndeterminateColor);
+    field public static final androidx.tv.material3.CheckboxDefaults INSTANCE;
+  }
+
+  public final class CheckboxKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.tv.material3.ClickableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ClickableSurfaceScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    field public static final androidx.tv.material3.ClickableSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceGlow {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceScale {
+    field public static final androidx.tv.material3.ClickableSurfaceScale.Companion Companion;
+  }
+
+  public static final class ClickableSurfaceScale.Companion {
+    method public androidx.tv.material3.ClickableSurfaceScale getNone();
+    property public final androidx.tv.material3.ClickableSurfaceScale None;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceShape {
+  }
+
+  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ColorScheme {
+    ctor public ColorScheme(long primary, long onPrimary, long primaryContainer, long onPrimaryContainer, long inversePrimary, long secondary, long onSecondary, long secondaryContainer, long onSecondaryContainer, long tertiary, long onTertiary, long tertiaryContainer, long onTertiaryContainer, long background, long onBackground, long surface, long onSurface, long surfaceVariant, long onSurfaceVariant, long surfaceTint, long inverseSurface, long inverseOnSurface, long error, long onError, long errorContainer, long onErrorContainer, long border, long borderVariant, long scrim);
+    method public androidx.tv.material3.ColorScheme copy(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method public long getBackground();
+    method public long getBorder();
+    method public long getBorderVariant();
+    method public long getError();
+    method public long getErrorContainer();
+    method public long getInverseOnSurface();
+    method public long getInversePrimary();
+    method public long getInverseSurface();
+    method public long getOnBackground();
+    method public long getOnError();
+    method public long getOnErrorContainer();
+    method public long getOnPrimary();
+    method public long getOnPrimaryContainer();
+    method public long getOnSecondary();
+    method public long getOnSecondaryContainer();
+    method public long getOnSurface();
+    method public long getOnSurfaceVariant();
+    method public long getOnTertiary();
+    method public long getOnTertiaryContainer();
+    method public long getPrimary();
+    method public long getPrimaryContainer();
+    method public long getScrim();
+    method public long getSecondary();
+    method public long getSecondaryContainer();
+    method public long getSurface();
+    method public long getSurfaceTint();
+    method public long getSurfaceVariant();
+    method public long getTertiary();
+    method public long getTertiaryContainer();
+    property public final long background;
+    property public final long border;
+    property public final long borderVariant;
+    property public final long error;
+    property public final long errorContainer;
+    property public final long inverseOnSurface;
+    property public final long inversePrimary;
+    property public final long inverseSurface;
+    property public final long onBackground;
+    property public final long onError;
+    property public final long onErrorContainer;
+    property public final long onPrimary;
+    property public final long onPrimaryContainer;
+    property public final long onSecondary;
+    property public final long onSecondaryContainer;
+    property public final long onSurface;
+    property public final long onSurfaceVariant;
+    property public final long onTertiary;
+    property public final long onTertiaryContainer;
+    property public final long primary;
+    property public final long primaryContainer;
+    property public final long scrim;
+    property public final long secondary;
+    property public final long secondaryContainer;
+    property public final long surface;
+    property public final long surfaceTint;
+    property public final long surfaceVariant;
+    property public final long tertiary;
+    property public final long tertiaryContainer;
+  }
+
+  public final class ColorSchemeKt {
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(androidx.tv.material3.ColorScheme, long backgroundColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(long backgroundColor);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme darkColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme lightColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long surfaceColorAtElevation(androidx.tv.material3.ColorScheme, float elevation);
+  }
+
   public final class ContentColorKt {
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
   }
 
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class DrawerState {
+    ctor public DrawerState(optional androidx.tv.material3.DrawerValue initialValue);
+    method public androidx.tv.material3.DrawerValue getCurrentValue();
+    method public void setValue(androidx.tv.material3.DrawerValue drawerValue);
+    property public final androidx.tv.material3.DrawerValue currentValue;
+    field public static final androidx.tv.material3.DrawerState.Companion Companion;
+  }
+
+  public static final class DrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> Saver;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public enum DrawerValue {
+    method public static androidx.tv.material3.DrawerValue valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.tv.material3.DrawerValue[] values();
+    enum_constant public static final androidx.tv.material3.DrawerValue Closed;
+    enum_constant public static final androidx.tv.material3.DrawerValue Open;
+  }
+
+  @kotlin.RequiresOptIn(message="This tv-material API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvMaterial3Api {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Glow {
+    ctor public Glow(long elevationColor, float elevation);
+    method public androidx.tv.material3.Glow copy(optional androidx.compose.ui.graphics.Color? glowColor, optional androidx.compose.ui.unit.Dp? glowElevation);
+    method public float getElevation();
+    method public long getElevationColor();
+    property public final float elevation;
+    property public final long elevationColor;
+    field public static final androidx.tv.material3.Glow.Companion Companion;
+  }
+
+  public static final class Glow.Companion {
+    method public androidx.tv.material3.Glow getNone();
+    property public final androidx.tv.material3.Glow None;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class IconButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public float getLargeButtonSize();
+    method public float getLargeIconSize();
+    method public float getMediumButtonSize();
+    method public float getMediumIconSize();
+    method public float getSmallButtonSize();
+    method public float getSmallIconSize();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final float LargeButtonSize;
+    property public final float LargeIconSize;
+    property public final float MediumButtonSize;
+    property public final float MediumIconSize;
+    property public final float SmallButtonSize;
+    property public final float SmallIconSize;
+    field public static final androidx.tv.material3.IconButtonDefaults INSTANCE;
+  }
+
+  public final class IconButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedIconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+  }
+
+  public final class IconKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListBackgroundScope implements androidx.compose.foundation.layout.BoxScope {
+    method @androidx.compose.runtime.Composable public void AnimatedContent(int targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<java.lang.Integer>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super java.lang.Integer,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListDefaults {
+    method public androidx.compose.animation.EnterTransition getEnterTransition();
+    method public androidx.compose.animation.ExitTransition getExitTransition();
+    property public final androidx.compose.animation.EnterTransition EnterTransition;
+    property public final androidx.compose.animation.ExitTransition ExitTransition;
+    field public static final androidx.tv.material3.ImmersiveListDefaults INSTANCE;
+  }
+
+  public final class ImmersiveListKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ImmersiveList(kotlin.jvm.functions.Function3<? super androidx.tv.material3.ImmersiveListBackgroundScope,? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment listAlignment, kotlin.jvm.functions.Function1<? super androidx.tv.material3.ImmersiveListScope,kotlin.Unit> list);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListScope {
+    method public androidx.compose.ui.Modifier immersiveListItem(androidx.compose.ui.Modifier, int index);
+  }
+
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public final androidx.tv.material3.ColorScheme colorScheme;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
     field public static final androidx.tv.material3.MaterialTheme INSTANCE;
   }
 
+  public final class MaterialThemeKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void MaterialTheme(optional androidx.tv.material3.ColorScheme colorScheme, optional androidx.tv.material3.Shapes shapes, optional androidx.tv.material3.Typography typography, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class NavigationDrawerKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ModalNavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void NavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.DrawerState rememberDrawerState(androidx.tv.material3.DrawerValue initialValue);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.NonInteractiveSurfaceColors colors(optional long containerColor, optional long contentColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getShape();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape shape;
+    field public static final androidx.tv.material3.NonInteractiveSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize();
+    method public float getIconSpacing();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    field public static final androidx.tv.material3.OutlinedButtonDefaults INSTANCE;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedIconButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public float getLargeButtonSize();
+    method public float getLargeIconSize();
+    method public float getMediumButtonSize();
+    method public float getMediumIconSize();
+    method public float getSmallButtonSize();
+    method public float getSmallIconSize();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final float LargeButtonSize;
+    property public final float LargeIconSize;
+    property public final float MediumButtonSize;
+    property public final float MediumIconSize;
+    property public final float SmallButtonSize;
+    property public final float SmallIconSize;
+    field public static final androidx.tv.material3.OutlinedIconButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledSelectedColor, optional long disabledUnselectedColor);
+    field public static final androidx.tv.material3.RadioButtonDefaults INSTANCE;
+  }
+
+  public final class RadioButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.RadioButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public sealed interface ScrollPauseHandle {
+    method public void resumeAutoScroll();
+  }
+
   public final class ShapeDefaults {
     method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
     method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
@@ -45,10 +449,54 @@
   }
 
   public final class SurfaceKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(optional androidx.compose.ui.Modifier modifier, optional float tonalElevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.tv.material3.NonInteractiveSurfaceColors colors, optional androidx.tv.material3.Border border, optional androidx.tv.material3.Glow glow, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ToggleableSurfaceShape shape, optional androidx.tv.material3.ToggleableSurfaceColors colors, optional androidx.tv.material3.ToggleableSurfaceScale scale, optional androidx.tv.material3.ToggleableSurfaceBorder border, optional androidx.tv.material3.ToggleableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ClickableSurfaceShape shape, optional androidx.tv.material3.ClickableSurfaceColors colors, optional androidx.tv.material3.ClickableSurfaceScale scale, optional androidx.tv.material3.ClickableSurfaceBorder border, optional androidx.tv.material3.ClickableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteTonalElevation;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional long checkedBorderColor, optional long checkedIconColor, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional long uncheckedBorderColor, optional long uncheckedIconColor, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledCheckedBorderColor, optional long disabledCheckedIconColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor, optional long disabledUncheckedBorderColor, optional long disabledUncheckedIconColor);
+    method public float getIconSize();
+    property public final float IconSize;
+    field public static final androidx.tv.material3.SwitchDefaults INSTANCE;
+  }
+
+  public final class SwitchKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.tv.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
+    field public static final androidx.tv.material3.TabDefaults INSTANCE;
+  }
+
+  public final class TabKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabRowDefaults {
+    method @androidx.compose.runtime.Composable public void PillIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
+    method @androidx.compose.runtime.Composable public void TabSeparator();
+    method @androidx.compose.runtime.Composable public void UnderlinedIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
+    method @androidx.compose.runtime.Composable public long contentColor();
+    method public long getContainerColor();
+    property public final long ContainerColor;
+    field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
+  }
+
+  public final class TabRowKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+  }
+
   public final class TextKt {
     method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
@@ -57,6 +505,30 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceDefaults {
+    method public androidx.tv.material3.ToggleableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border selectedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedSelectedBorder, optional androidx.tv.material3.Border focusedDisabledBorder, optional androidx.tv.material3.Border pressedSelectedBorder, optional androidx.tv.material3.Border selectedDisabledBorder, optional androidx.tv.material3.Border focusedSelectedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long selectedContainerColor, optional long selectedContentColor, optional long disabledContainerColor, optional long disabledContentColor, optional long focusedSelectedContainerColor, optional long focusedSelectedContentColor, optional long pressedSelectedContainerColor, optional long pressedSelectedContentColor);
+    method public androidx.tv.material3.ToggleableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow, optional androidx.tv.material3.Glow selectedGlow, optional androidx.tv.material3.Glow focusedSelectedGlow, optional androidx.tv.material3.Glow pressedSelectedGlow);
+    method public androidx.tv.material3.ToggleableSurfaceScale scale(optional float scale, optional float focusedScale, optional float pressedScale, optional float selectedScale, optional float disabledScale, optional float focusedSelectedScale, optional float focusedDisabledScale, optional float pressedSelectedScale, optional float selectedDisabledScale, optional float focusedSelectedDisabledScale);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape selectedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape, optional androidx.compose.ui.graphics.Shape pressedSelectedShape, optional androidx.compose.ui.graphics.Shape selectedDisabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedDisabledShape);
+    field public static final androidx.tv.material3.ToggleableSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceGlow {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceShape {
+  }
+
   @androidx.compose.runtime.Immutable public final class Typography {
     ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
     method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
@@ -92,5 +564,23 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonContentColor {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonDefaults {
+    method @androidx.compose.runtime.Composable public void Background(boolean enabled, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.WideButtonContentColor contentColor(optional long color, optional long focusedColor, optional long pressedColor, optional long disabledColor);
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    field public static final androidx.tv.material3.WideButtonDefaults INSTANCE;
+  }
+
+  public final class WideButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? subtitle, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+  }
+
 }
 
diff --git a/tv/tv-material/api/public_plus_experimental_current.txt b/tv/tv-material/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9fa65e0..0000000
--- a/tv/tv-material/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,586 +0,0 @@
-// Signature format: 4.0
-package androidx.tv.material3 {
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Border {
-    ctor public Border(androidx.compose.foundation.BorderStroke border, optional float inset, optional androidx.compose.ui.graphics.Shape shape);
-    method public androidx.tv.material3.Border copy(optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.ui.unit.Dp? inset, optional androidx.compose.ui.graphics.Shape? shape);
-    method public androidx.compose.foundation.BorderStroke getBorder();
-    method public float getInset();
-    method public androidx.compose.ui.graphics.Shape getShape();
-    property public final androidx.compose.foundation.BorderStroke border;
-    property public final float inset;
-    property public final androidx.compose.ui.graphics.Shape shape;
-    field public static final androidx.tv.material3.Border.Companion Companion;
-  }
-
-  public static final class Border.Companion {
-    method public androidx.tv.material3.Border getNone();
-    property public final androidx.tv.material3.Border None;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonBorder {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
-    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
-    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
-    method public float getIconSize();
-    method public float getIconSpacing();
-    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
-    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
-    property public final float IconSize;
-    property public final float IconSpacing;
-    field public static final androidx.tv.material3.ButtonDefaults INSTANCE;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonGlow {
-  }
-
-  public final class ButtonKt {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonScale {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonShape {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardBorder {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors compactCardColors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
-    method public androidx.compose.ui.graphics.Brush getContainerGradient();
-    method public androidx.tv.material3.CardGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.CardScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale);
-    method public androidx.tv.material3.CardShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape);
-    property public final androidx.compose.ui.graphics.Brush ContainerGradient;
-    field public static final float HorizontalImageAspectRatio = 1.7777778f;
-    field public static final androidx.tv.material3.CardDefaults INSTANCE;
-    field public static final float SquareImageAspectRatio = 1.0f;
-    field public static final float VerticalImageAspectRatio = 0.6666667f;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardGlow {
-  }
-
-  public final class CardKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void CompactCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.ui.graphics.Brush scrimBrush, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutDefaults {
-    method @androidx.compose.runtime.Composable public void ImageCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardLayoutColors contentColor(optional long contentColor, optional long focusedContentColor, optional long pressedContentColor);
-    field public static final androidx.tv.material3.CardLayoutDefaults INSTANCE;
-  }
-
-  public final class CardLayoutKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void StandardCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardScale {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardShape {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public void IndicatorRow(int itemCount, int activeItemIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
-    method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
-    property @androidx.compose.runtime.Composable public final androidx.compose.animation.ContentTransform contentTransform;
-    field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
-    field public static final long TimeToDisplayItemMillis = 5000L; // 0x1388L
-  }
-
-  public final class CarouselKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Carousel(int itemCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CarouselState carouselState, optional long autoScrollDurationMillis, optional androidx.compose.animation.ContentTransform contentTransformStartToEnd, optional androidx.compose.animation.ContentTransform contentTransformEndToStart, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedContentScope,? super java.lang.Integer,kotlin.Unit> content);
-  }
-
-  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselState {
-    ctor public CarouselState(optional int initialActiveItemIndex);
-    method public int getActiveItemIndex();
-    method public androidx.tv.material3.ScrollPauseHandle pauseAutoScroll(int itemIndex);
-    property public final int activeItemIndex;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxDefaults {
-    method @androidx.compose.runtime.Composable public androidx.tv.material3.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledCheckedColor, optional long disabledUncheckedColor, optional long disabledIndeterminateColor);
-    field public static final androidx.tv.material3.CheckboxDefaults INSTANCE;
-  }
-
-  public final class CheckboxKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceBorder {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
-    method public androidx.tv.material3.ClickableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ClickableSurfaceScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    field public static final androidx.tv.material3.ClickableSurfaceDefaults INSTANCE;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceGlow {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceScale {
-    field public static final androidx.tv.material3.ClickableSurfaceScale.Companion Companion;
-  }
-
-  public static final class ClickableSurfaceScale.Companion {
-    method public androidx.tv.material3.ClickableSurfaceScale getNone();
-    property public final androidx.tv.material3.ClickableSurfaceScale None;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceShape {
-  }
-
-  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ColorScheme {
-    ctor public ColorScheme(long primary, long onPrimary, long primaryContainer, long onPrimaryContainer, long inversePrimary, long secondary, long onSecondary, long secondaryContainer, long onSecondaryContainer, long tertiary, long onTertiary, long tertiaryContainer, long onTertiaryContainer, long background, long onBackground, long surface, long onSurface, long surfaceVariant, long onSurfaceVariant, long surfaceTint, long inverseSurface, long inverseOnSurface, long error, long onError, long errorContainer, long onErrorContainer, long border, long borderVariant, long scrim);
-    method public androidx.tv.material3.ColorScheme copy(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
-    method public long getBackground();
-    method public long getBorder();
-    method public long getBorderVariant();
-    method public long getError();
-    method public long getErrorContainer();
-    method public long getInverseOnSurface();
-    method public long getInversePrimary();
-    method public long getInverseSurface();
-    method public long getOnBackground();
-    method public long getOnError();
-    method public long getOnErrorContainer();
-    method public long getOnPrimary();
-    method public long getOnPrimaryContainer();
-    method public long getOnSecondary();
-    method public long getOnSecondaryContainer();
-    method public long getOnSurface();
-    method public long getOnSurfaceVariant();
-    method public long getOnTertiary();
-    method public long getOnTertiaryContainer();
-    method public long getPrimary();
-    method public long getPrimaryContainer();
-    method public long getScrim();
-    method public long getSecondary();
-    method public long getSecondaryContainer();
-    method public long getSurface();
-    method public long getSurfaceTint();
-    method public long getSurfaceVariant();
-    method public long getTertiary();
-    method public long getTertiaryContainer();
-    property public final long background;
-    property public final long border;
-    property public final long borderVariant;
-    property public final long error;
-    property public final long errorContainer;
-    property public final long inverseOnSurface;
-    property public final long inversePrimary;
-    property public final long inverseSurface;
-    property public final long onBackground;
-    property public final long onError;
-    property public final long onErrorContainer;
-    property public final long onPrimary;
-    property public final long onPrimaryContainer;
-    property public final long onSecondary;
-    property public final long onSecondaryContainer;
-    property public final long onSurface;
-    property public final long onSurfaceVariant;
-    property public final long onTertiary;
-    property public final long onTertiaryContainer;
-    property public final long primary;
-    property public final long primaryContainer;
-    property public final long scrim;
-    property public final long secondary;
-    property public final long secondaryContainer;
-    property public final long surface;
-    property public final long surfaceTint;
-    property public final long surfaceVariant;
-    property public final long tertiary;
-    property public final long tertiaryContainer;
-  }
-
-  public final class ColorSchemeKt {
-    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(androidx.tv.material3.ColorScheme, long backgroundColor);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(long backgroundColor);
-    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme darkColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
-    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme lightColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
-    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long surfaceColorAtElevation(androidx.tv.material3.ColorScheme, float elevation);
-  }
-
-  public final class ContentColorKt {
-    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
-    property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class DrawerState {
-    ctor public DrawerState(optional androidx.tv.material3.DrawerValue initialValue);
-    method public androidx.tv.material3.DrawerValue getCurrentValue();
-    method public void setValue(androidx.tv.material3.DrawerValue drawerValue);
-    property public final androidx.tv.material3.DrawerValue currentValue;
-    field public static final androidx.tv.material3.DrawerState.Companion Companion;
-  }
-
-  public static final class DrawerState.Companion {
-    method public androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> getSaver();
-    property public final androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> Saver;
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public enum DrawerValue {
-    method public static androidx.tv.material3.DrawerValue valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.tv.material3.DrawerValue[] values();
-    enum_constant public static final androidx.tv.material3.DrawerValue Closed;
-    enum_constant public static final androidx.tv.material3.DrawerValue Open;
-  }
-
-  @kotlin.RequiresOptIn(message="This tv-material API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvMaterial3Api {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Glow {
-    ctor public Glow(long elevationColor, float elevation);
-    method public androidx.tv.material3.Glow copy(optional androidx.compose.ui.graphics.Color? glowColor, optional androidx.compose.ui.unit.Dp? glowElevation);
-    method public float getElevation();
-    method public long getElevationColor();
-    property public final float elevation;
-    property public final long elevationColor;
-    field public static final androidx.tv.material3.Glow.Companion Companion;
-  }
-
-  public static final class Glow.Companion {
-    method public androidx.tv.material3.Glow getNone();
-    property public final androidx.tv.material3.Glow None;
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class IconButtonDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
-    method public float getLargeButtonSize();
-    method public float getLargeIconSize();
-    method public float getMediumButtonSize();
-    method public float getMediumIconSize();
-    method public float getSmallButtonSize();
-    method public float getSmallIconSize();
-    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    property public final float LargeButtonSize;
-    property public final float LargeIconSize;
-    property public final float MediumButtonSize;
-    property public final float MediumIconSize;
-    property public final float SmallButtonSize;
-    property public final float SmallIconSize;
-    field public static final androidx.tv.material3.IconButtonDefaults INSTANCE;
-  }
-
-  public final class IconButtonKt {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedIconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-  }
-
-  public final class IconKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListBackgroundScope implements androidx.compose.foundation.layout.BoxScope {
-    method @androidx.compose.runtime.Composable public void AnimatedContent(int targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<java.lang.Integer>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super java.lang.Integer,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListDefaults {
-    method public androidx.compose.animation.EnterTransition getEnterTransition();
-    method public androidx.compose.animation.ExitTransition getExitTransition();
-    property public final androidx.compose.animation.EnterTransition EnterTransition;
-    property public final androidx.compose.animation.ExitTransition ExitTransition;
-    field public static final androidx.tv.material3.ImmersiveListDefaults INSTANCE;
-  }
-
-  public final class ImmersiveListKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ImmersiveList(kotlin.jvm.functions.Function3<? super androidx.tv.material3.ImmersiveListBackgroundScope,? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment listAlignment, kotlin.jvm.functions.Function1<? super androidx.tv.material3.ImmersiveListScope,kotlin.Unit> list);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListScope {
-    method public androidx.compose.ui.Modifier immersiveListItem(androidx.compose.ui.Modifier, int index);
-  }
-
-  public final class MaterialTheme {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
-    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public final androidx.tv.material3.ColorScheme colorScheme;
-    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
-    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
-    field public static final androidx.tv.material3.MaterialTheme INSTANCE;
-  }
-
-  public final class MaterialThemeKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void MaterialTheme(optional androidx.tv.material3.ColorScheme colorScheme, optional androidx.tv.material3.Shapes shapes, optional androidx.tv.material3.Typography typography, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-  }
-
-  public final class NavigationDrawerKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ModalNavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void NavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.DrawerState rememberDrawerState(androidx.tv.material3.DrawerValue initialValue);
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.NonInteractiveSurfaceColors colors(optional long containerColor, optional long contentColor);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getShape();
-    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape shape;
-    field public static final androidx.tv.material3.NonInteractiveSurfaceDefaults INSTANCE;
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedButtonDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
-    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
-    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
-    method public float getIconSize();
-    method public float getIconSpacing();
-    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
-    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
-    property public final float IconSize;
-    property public final float IconSpacing;
-    field public static final androidx.tv.material3.OutlinedButtonDefaults INSTANCE;
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedIconButtonDefaults {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
-    method public float getLargeButtonSize();
-    method public float getLargeIconSize();
-    method public float getMediumButtonSize();
-    method public float getMediumIconSize();
-    method public float getSmallButtonSize();
-    method public float getSmallIconSize();
-    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    property public final float LargeButtonSize;
-    property public final float LargeIconSize;
-    property public final float MediumButtonSize;
-    property public final float MediumIconSize;
-    property public final float SmallButtonSize;
-    property public final float SmallIconSize;
-    field public static final androidx.tv.material3.OutlinedIconButtonDefaults INSTANCE;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonDefaults {
-    method @androidx.compose.runtime.Composable public androidx.tv.material3.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledSelectedColor, optional long disabledUnselectedColor);
-    field public static final androidx.tv.material3.RadioButtonDefaults INSTANCE;
-  }
-
-  public final class RadioButtonKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.RadioButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public sealed interface ScrollPauseHandle {
-    method public void resumeAutoScroll();
-  }
-
-  public final class ShapeDefaults {
-    method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
-    method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
-    method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
-    method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
-    method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
-    property public final androidx.compose.foundation.shape.CornerBasedShape ExtraLarge;
-    property public final androidx.compose.foundation.shape.CornerBasedShape ExtraSmall;
-    property public final androidx.compose.foundation.shape.CornerBasedShape Large;
-    property public final androidx.compose.foundation.shape.CornerBasedShape Medium;
-    property public final androidx.compose.foundation.shape.CornerBasedShape Small;
-    field public static final androidx.tv.material3.ShapeDefaults INSTANCE;
-  }
-
-  @androidx.compose.runtime.Immutable public final class Shapes {
-    ctor public Shapes(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
-    method public androidx.tv.material3.Shapes copy(optional androidx.compose.foundation.shape.CornerBasedShape extraSmall, optional androidx.compose.foundation.shape.CornerBasedShape small, optional androidx.compose.foundation.shape.CornerBasedShape medium, optional androidx.compose.foundation.shape.CornerBasedShape large, optional androidx.compose.foundation.shape.CornerBasedShape extraLarge);
-    method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
-    method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
-    method public androidx.compose.foundation.shape.CornerBasedShape getLarge();
-    method public androidx.compose.foundation.shape.CornerBasedShape getMedium();
-    method public androidx.compose.foundation.shape.CornerBasedShape getSmall();
-    property public final androidx.compose.foundation.shape.CornerBasedShape extraLarge;
-    property public final androidx.compose.foundation.shape.CornerBasedShape extraSmall;
-    property public final androidx.compose.foundation.shape.CornerBasedShape large;
-    property public final androidx.compose.foundation.shape.CornerBasedShape medium;
-    property public final androidx.compose.foundation.shape.CornerBasedShape small;
-  }
-
-  public final class SurfaceKt {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(optional androidx.compose.ui.Modifier modifier, optional float tonalElevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.tv.material3.NonInteractiveSurfaceColors colors, optional androidx.tv.material3.Border border, optional androidx.tv.material3.Glow glow, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ToggleableSurfaceShape shape, optional androidx.tv.material3.ToggleableSurfaceColors colors, optional androidx.tv.material3.ToggleableSurfaceScale scale, optional androidx.tv.material3.ToggleableSurfaceBorder border, optional androidx.tv.material3.ToggleableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ClickableSurfaceShape shape, optional androidx.tv.material3.ClickableSurfaceColors colors, optional androidx.tv.material3.ClickableSurfaceScale scale, optional androidx.tv.material3.ClickableSurfaceBorder border, optional androidx.tv.material3.ClickableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
-    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
-    property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteTonalElevation;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchDefaults {
-    method @androidx.compose.runtime.Composable public androidx.tv.material3.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional long checkedBorderColor, optional long checkedIconColor, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional long uncheckedBorderColor, optional long uncheckedIconColor, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledCheckedBorderColor, optional long disabledCheckedIconColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor, optional long disabledUncheckedBorderColor, optional long disabledUncheckedIconColor);
-    method public float getIconSize();
-    property public final float IconSize;
-    field public static final androidx.tv.material3.SwitchDefaults INSTANCE;
-  }
-
-  public final class SwitchKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.tv.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabDefaults {
-    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
-    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
-    field public static final androidx.tv.material3.TabDefaults INSTANCE;
-  }
-
-  public final class TabKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabRowDefaults {
-    method @androidx.compose.runtime.Composable public void PillIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
-    method @androidx.compose.runtime.Composable public void TabSeparator();
-    method @androidx.compose.runtime.Composable public void UnderlinedIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
-    method @androidx.compose.runtime.Composable public long contentColor();
-    method public long getContainerColor();
-    property public final long ContainerColor;
-    field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
-  }
-
-  public final class TabRowKt {
-    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
-  }
-
-  public final class TextKt {
-    method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
-    method @androidx.compose.runtime.Composable public static void Text(String text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
-    method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> getLocalTextStyle();
-    property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceBorder {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceColors {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceDefaults {
-    method public androidx.tv.material3.ToggleableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border selectedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedSelectedBorder, optional androidx.tv.material3.Border focusedDisabledBorder, optional androidx.tv.material3.Border pressedSelectedBorder, optional androidx.tv.material3.Border selectedDisabledBorder, optional androidx.tv.material3.Border focusedSelectedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long selectedContainerColor, optional long selectedContentColor, optional long disabledContainerColor, optional long disabledContentColor, optional long focusedSelectedContainerColor, optional long focusedSelectedContentColor, optional long pressedSelectedContainerColor, optional long pressedSelectedContentColor);
-    method public androidx.tv.material3.ToggleableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow, optional androidx.tv.material3.Glow selectedGlow, optional androidx.tv.material3.Glow focusedSelectedGlow, optional androidx.tv.material3.Glow pressedSelectedGlow);
-    method public androidx.tv.material3.ToggleableSurfaceScale scale(optional float scale, optional float focusedScale, optional float pressedScale, optional float selectedScale, optional float disabledScale, optional float focusedSelectedScale, optional float focusedDisabledScale, optional float pressedSelectedScale, optional float selectedDisabledScale, optional float focusedSelectedDisabledScale);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape selectedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape, optional androidx.compose.ui.graphics.Shape pressedSelectedShape, optional androidx.compose.ui.graphics.Shape selectedDisabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedDisabledShape);
-    field public static final androidx.tv.material3.ToggleableSurfaceDefaults INSTANCE;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceGlow {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceScale {
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceShape {
-  }
-
-  @androidx.compose.runtime.Immutable public final class Typography {
-    ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
-    method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
-    method public androidx.compose.ui.text.TextStyle getBodyLarge();
-    method public androidx.compose.ui.text.TextStyle getBodyMedium();
-    method public androidx.compose.ui.text.TextStyle getBodySmall();
-    method public androidx.compose.ui.text.TextStyle getDisplayLarge();
-    method public androidx.compose.ui.text.TextStyle getDisplayMedium();
-    method public androidx.compose.ui.text.TextStyle getDisplaySmall();
-    method public androidx.compose.ui.text.TextStyle getHeadlineLarge();
-    method public androidx.compose.ui.text.TextStyle getHeadlineMedium();
-    method public androidx.compose.ui.text.TextStyle getHeadlineSmall();
-    method public androidx.compose.ui.text.TextStyle getLabelLarge();
-    method public androidx.compose.ui.text.TextStyle getLabelMedium();
-    method public androidx.compose.ui.text.TextStyle getLabelSmall();
-    method public androidx.compose.ui.text.TextStyle getTitleLarge();
-    method public androidx.compose.ui.text.TextStyle getTitleMedium();
-    method public androidx.compose.ui.text.TextStyle getTitleSmall();
-    property public final androidx.compose.ui.text.TextStyle bodyLarge;
-    property public final androidx.compose.ui.text.TextStyle bodyMedium;
-    property public final androidx.compose.ui.text.TextStyle bodySmall;
-    property public final androidx.compose.ui.text.TextStyle displayLarge;
-    property public final androidx.compose.ui.text.TextStyle displayMedium;
-    property public final androidx.compose.ui.text.TextStyle displaySmall;
-    property public final androidx.compose.ui.text.TextStyle headlineLarge;
-    property public final androidx.compose.ui.text.TextStyle headlineMedium;
-    property public final androidx.compose.ui.text.TextStyle headlineSmall;
-    property public final androidx.compose.ui.text.TextStyle labelLarge;
-    property public final androidx.compose.ui.text.TextStyle labelMedium;
-    property public final androidx.compose.ui.text.TextStyle labelSmall;
-    property public final androidx.compose.ui.text.TextStyle titleLarge;
-    property public final androidx.compose.ui.text.TextStyle titleMedium;
-    property public final androidx.compose.ui.text.TextStyle titleSmall;
-  }
-
-  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonContentColor {
-  }
-
-  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonDefaults {
-    method @androidx.compose.runtime.Composable public void Background(boolean enabled, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.WideButtonContentColor contentColor(optional long color, optional long focusedColor, optional long pressedColor, optional long disabledColor);
-    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
-    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
-    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
-    field public static final androidx.tv.material3.WideButtonDefaults INSTANCE;
-  }
-
-  public final class WideButtonKt {
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
-    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? subtitle, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
-  }
-
-}
-
diff --git a/tv/tv-material/api/restricted_current.txt b/tv/tv-material/api/restricted_current.txt
index dea09db..9fa65e0 100644
--- a/tv/tv-material/api/restricted_current.txt
+++ b/tv/tv-material/api/restricted_current.txt
@@ -1,20 +1,424 @@
 // Signature format: 4.0
 package androidx.tv.material3 {
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Border {
+    ctor public Border(androidx.compose.foundation.BorderStroke border, optional float inset, optional androidx.compose.ui.graphics.Shape shape);
+    method public androidx.tv.material3.Border copy(optional androidx.compose.foundation.BorderStroke? border, optional androidx.compose.ui.unit.Dp? inset, optional androidx.compose.ui.graphics.Shape? shape);
+    method public androidx.compose.foundation.BorderStroke getBorder();
+    method public float getInset();
+    method public androidx.compose.ui.graphics.Shape getShape();
+    property public final androidx.compose.foundation.BorderStroke border;
+    property public final float inset;
+    property public final androidx.compose.ui.graphics.Shape shape;
+    field public static final androidx.tv.material3.Border.Companion Companion;
+  }
+
+  public static final class Border.Companion {
+    method public androidx.tv.material3.Border getNone();
+    property public final androidx.tv.material3.Border None;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize();
+    method public float getIconSpacing();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    field public static final androidx.tv.material3.ButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonGlow {
+  }
+
+  public final class ButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Button(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ButtonShape {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardColors compactCardColors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor);
+    method public androidx.compose.ui.graphics.Brush getContainerGradient();
+    method public androidx.tv.material3.CardGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.CardScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale);
+    method public androidx.tv.material3.CardShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape);
+    property public final androidx.compose.ui.graphics.Brush ContainerGradient;
+    field public static final float HorizontalImageAspectRatio = 1.7777778f;
+    field public static final androidx.tv.material3.CardDefaults INSTANCE;
+    field public static final float SquareImageAspectRatio = 1.0f;
+    field public static final float VerticalImageAspectRatio = 0.6666667f;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardGlow {
+  }
+
+  public final class CardKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Card(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void CompactCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.ui.graphics.Brush scrimBrush, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideClassicCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> image, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, optional androidx.compose.foundation.layout.PaddingValues contentPadding, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardLayoutDefaults {
+    method @androidx.compose.runtime.Composable public void ImageCard(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CardShape shape, optional androidx.tv.material3.CardColors colors, optional androidx.tv.material3.CardScale scale, optional androidx.tv.material3.CardBorder border, optional androidx.tv.material3.CardGlow glow, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.CardLayoutColors contentColor(optional long contentColor, optional long focusedContentColor, optional long pressedContentColor);
+    field public static final androidx.tv.material3.CardLayoutDefaults INSTANCE;
+  }
+
+  public final class CardLayoutKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void StandardCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideCardLayout(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Unit> imageCard, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> subtitle, optional kotlin.jvm.functions.Function0<kotlin.Unit> description, optional androidx.tv.material3.CardLayoutColors contentColor, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CardShape {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public void IndicatorRow(int itemCount, int activeItemIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
+    method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
+    property @androidx.compose.runtime.Composable public final androidx.compose.animation.ContentTransform contentTransform;
+    field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
+    field public static final long TimeToDisplayItemMillis = 5000L; // 0x1388L
+  }
+
+  public final class CarouselKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Carousel(int itemCount, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.CarouselState carouselState, optional long autoScrollDurationMillis, optional androidx.compose.animation.ContentTransform contentTransformStartToEnd, optional androidx.compose.animation.ContentTransform contentTransformEndToStart, optional kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> carouselIndicator, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedContentScope,? super java.lang.Integer,kotlin.Unit> content);
+  }
+
+  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselState {
+    ctor public CarouselState(optional int initialActiveItemIndex);
+    method public int getActiveItemIndex();
+    method public androidx.tv.material3.ScrollPauseHandle pauseAutoScroll(int itemIndex);
+    property public final int activeItemIndex;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CheckboxDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.CheckboxColors colors(optional long checkedColor, optional long uncheckedColor, optional long checkmarkColor, optional long disabledCheckedColor, optional long disabledUncheckedColor, optional long disabledIndeterminateColor);
+    field public static final androidx.tv.material3.CheckboxDefaults INSTANCE;
+  }
+
+  public final class CheckboxKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Checkbox(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TriStateCheckbox(androidx.compose.ui.state.ToggleableState state, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.CheckboxColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.tv.material3.ClickableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ClickableSurfaceScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ClickableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    field public static final androidx.tv.material3.ClickableSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceGlow {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceScale {
+    field public static final androidx.tv.material3.ClickableSurfaceScale.Companion Companion;
+  }
+
+  public static final class ClickableSurfaceScale.Companion {
+    method public androidx.tv.material3.ClickableSurfaceScale getNone();
+    property public final androidx.tv.material3.ClickableSurfaceScale None;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ClickableSurfaceShape {
+  }
+
+  @androidx.compose.runtime.Stable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ColorScheme {
+    ctor public ColorScheme(long primary, long onPrimary, long primaryContainer, long onPrimaryContainer, long inversePrimary, long secondary, long onSecondary, long secondaryContainer, long onSecondaryContainer, long tertiary, long onTertiary, long tertiaryContainer, long onTertiaryContainer, long background, long onBackground, long surface, long onSurface, long surfaceVariant, long onSurfaceVariant, long surfaceTint, long inverseSurface, long inverseOnSurface, long error, long onError, long errorContainer, long onErrorContainer, long border, long borderVariant, long scrim);
+    method public androidx.tv.material3.ColorScheme copy(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method public long getBackground();
+    method public long getBorder();
+    method public long getBorderVariant();
+    method public long getError();
+    method public long getErrorContainer();
+    method public long getInverseOnSurface();
+    method public long getInversePrimary();
+    method public long getInverseSurface();
+    method public long getOnBackground();
+    method public long getOnError();
+    method public long getOnErrorContainer();
+    method public long getOnPrimary();
+    method public long getOnPrimaryContainer();
+    method public long getOnSecondary();
+    method public long getOnSecondaryContainer();
+    method public long getOnSurface();
+    method public long getOnSurfaceVariant();
+    method public long getOnTertiary();
+    method public long getOnTertiaryContainer();
+    method public long getPrimary();
+    method public long getPrimaryContainer();
+    method public long getScrim();
+    method public long getSecondary();
+    method public long getSecondaryContainer();
+    method public long getSurface();
+    method public long getSurfaceTint();
+    method public long getSurfaceVariant();
+    method public long getTertiary();
+    method public long getTertiaryContainer();
+    property public final long background;
+    property public final long border;
+    property public final long borderVariant;
+    property public final long error;
+    property public final long errorContainer;
+    property public final long inverseOnSurface;
+    property public final long inversePrimary;
+    property public final long inverseSurface;
+    property public final long onBackground;
+    property public final long onError;
+    property public final long onErrorContainer;
+    property public final long onPrimary;
+    property public final long onPrimaryContainer;
+    property public final long onSecondary;
+    property public final long onSecondaryContainer;
+    property public final long onSurface;
+    property public final long onSurfaceVariant;
+    property public final long onTertiary;
+    property public final long onTertiaryContainer;
+    property public final long primary;
+    property public final long primaryContainer;
+    property public final long scrim;
+    property public final long secondary;
+    property public final long secondaryContainer;
+    property public final long surface;
+    property public final long surfaceTint;
+    property public final long surfaceVariant;
+    property public final long tertiary;
+    property public final long tertiaryContainer;
+  }
+
+  public final class ColorSchemeKt {
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(androidx.tv.material3.ColorScheme, long backgroundColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static long contentColorFor(long backgroundColor);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme darkColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.ColorScheme lightColorScheme(optional long primary, optional long onPrimary, optional long primaryContainer, optional long onPrimaryContainer, optional long inversePrimary, optional long secondary, optional long onSecondary, optional long secondaryContainer, optional long onSecondaryContainer, optional long tertiary, optional long onTertiary, optional long tertiaryContainer, optional long onTertiaryContainer, optional long background, optional long onBackground, optional long surface, optional long onSurface, optional long surfaceVariant, optional long onSurfaceVariant, optional long surfaceTint, optional long inverseSurface, optional long inverseOnSurface, optional long error, optional long onError, optional long errorContainer, optional long onErrorContainer, optional long border, optional long borderVariant, optional long scrim);
+    method @androidx.tv.material3.ExperimentalTvMaterial3Api public static long surfaceColorAtElevation(androidx.tv.material3.ColorScheme, float elevation);
+  }
+
   public final class ContentColorKt {
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> getLocalContentColor();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.graphics.Color> LocalContentColor;
   }
 
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class DrawerState {
+    ctor public DrawerState(optional androidx.tv.material3.DrawerValue initialValue);
+    method public androidx.tv.material3.DrawerValue getCurrentValue();
+    method public void setValue(androidx.tv.material3.DrawerValue drawerValue);
+    property public final androidx.tv.material3.DrawerValue currentValue;
+    field public static final androidx.tv.material3.DrawerState.Companion Companion;
+  }
+
+  public static final class DrawerState.Companion {
+    method public androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> getSaver();
+    property public final androidx.compose.runtime.saveable.Saver<androidx.tv.material3.DrawerState,androidx.tv.material3.DrawerValue> Saver;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public enum DrawerValue {
+    method public static androidx.tv.material3.DrawerValue valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.tv.material3.DrawerValue[] values();
+    enum_constant public static final androidx.tv.material3.DrawerValue Closed;
+    enum_constant public static final androidx.tv.material3.DrawerValue Open;
+  }
+
+  @kotlin.RequiresOptIn(message="This tv-material API is experimental and likely to change or be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalTvMaterial3Api {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class Glow {
+    ctor public Glow(long elevationColor, float elevation);
+    method public androidx.tv.material3.Glow copy(optional androidx.compose.ui.graphics.Color? glowColor, optional androidx.compose.ui.unit.Dp? glowElevation);
+    method public float getElevation();
+    method public long getElevationColor();
+    property public final float elevation;
+    property public final long elevationColor;
+    field public static final androidx.tv.material3.Glow.Companion Companion;
+  }
+
+  public static final class Glow.Companion {
+    method public androidx.tv.material3.Glow getNone();
+    property public final androidx.tv.material3.Glow None;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class IconButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public float getLargeButtonSize();
+    method public float getLargeIconSize();
+    method public float getMediumButtonSize();
+    method public float getMediumIconSize();
+    method public float getSmallButtonSize();
+    method public float getSmallIconSize();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final float LargeButtonSize;
+    property public final float LargeIconSize;
+    property public final float MediumButtonSize;
+    property public final float MediumIconSize;
+    property public final float SmallButtonSize;
+    property public final float SmallIconSize;
+    field public static final androidx.tv.material3.IconButtonDefaults INSTANCE;
+  }
+
+  public final class IconButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void IconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void OutlinedIconButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.ButtonColors colors, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+  }
+
+  public final class IconKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.ImageBitmap bitmap, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.painter.Painter painter, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Icon(androidx.compose.ui.graphics.vector.ImageVector imageVector, String? contentDescription, optional androidx.compose.ui.Modifier modifier, optional long tint);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListBackgroundScope implements androidx.compose.foundation.layout.BoxScope {
+    method @androidx.compose.runtime.Composable public void AnimatedContent(int targetState, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedContentTransitionScope<java.lang.Integer>,androidx.compose.animation.ContentTransform> transitionSpec, optional androidx.compose.ui.Alignment contentAlignment, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super java.lang.Integer,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable public void AnimatedVisibility(boolean visible, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.animation.EnterTransition enter, optional androidx.compose.animation.ExitTransition exit, optional String label, kotlin.jvm.functions.Function1<? super androidx.compose.animation.AnimatedVisibilityScope,kotlin.Unit> content);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListDefaults {
+    method public androidx.compose.animation.EnterTransition getEnterTransition();
+    method public androidx.compose.animation.ExitTransition getExitTransition();
+    property public final androidx.compose.animation.EnterTransition EnterTransition;
+    property public final androidx.compose.animation.ExitTransition ExitTransition;
+    field public static final androidx.tv.material3.ImmersiveListDefaults INSTANCE;
+  }
+
+  public final class ImmersiveListKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ImmersiveList(kotlin.jvm.functions.Function3<? super androidx.tv.material3.ImmersiveListBackgroundScope,? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> background, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.Alignment listAlignment, kotlin.jvm.functions.Function1<? super androidx.tv.material3.ImmersiveListScope,kotlin.Unit> list);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ImmersiveListScope {
+    method public androidx.compose.ui.Modifier immersiveListItem(androidx.compose.ui.Modifier, int index);
+  }
+
   public final class MaterialTheme {
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ColorScheme getColorScheme();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Shapes getShapes();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.Typography getTypography();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public final androidx.tv.material3.ColorScheme colorScheme;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Shapes shapes;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.tv.material3.Typography typography;
     field public static final androidx.tv.material3.MaterialTheme INSTANCE;
   }
 
+  public final class MaterialThemeKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void MaterialTheme(optional androidx.tv.material3.ColorScheme colorScheme, optional androidx.tv.material3.Shapes shapes, optional androidx.tv.material3.Typography typography, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+  }
+
+  public final class NavigationDrawerKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void ModalNavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, optional long scrimColor, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void NavigationDrawer(kotlin.jvm.functions.Function1<? super androidx.tv.material3.DrawerValue,kotlin.Unit> drawerContent, optional androidx.compose.ui.Modifier modifier, optional androidx.tv.material3.DrawerState drawerState, kotlin.jvm.functions.Function0<kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static androidx.tv.material3.DrawerState rememberDrawerState(androidx.tv.material3.DrawerValue initialValue);
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class NonInteractiveSurfaceDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.NonInteractiveSurfaceColors colors(optional long containerColor, optional long contentColor);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Shape getShape();
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape shape;
+    field public static final androidx.tv.material3.NonInteractiveSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public androidx.compose.foundation.layout.PaddingValues getButtonWithIconContentPadding();
+    method public androidx.compose.foundation.layout.PaddingValues getContentPadding();
+    method public float getIconSize();
+    method public float getIconSpacing();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final androidx.compose.foundation.layout.PaddingValues ButtonWithIconContentPadding;
+    property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public final float IconSize;
+    property public final float IconSpacing;
+    field public static final androidx.tv.material3.OutlinedButtonDefaults INSTANCE;
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class OutlinedIconButtonDefaults {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long disabledContainerColor, optional long disabledContentColor);
+    method public float getLargeButtonSize();
+    method public float getLargeIconSize();
+    method public float getMediumButtonSize();
+    method public float getMediumIconSize();
+    method public float getSmallButtonSize();
+    method public float getSmallIconSize();
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    property public final float LargeButtonSize;
+    property public final float LargeIconSize;
+    property public final float MediumButtonSize;
+    property public final float MediumIconSize;
+    property public final float SmallButtonSize;
+    property public final float SmallIconSize;
+    field public static final androidx.tv.material3.OutlinedIconButtonDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class RadioButtonDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.RadioButtonColors colors(optional long selectedColor, optional long unselectedColor, optional long disabledSelectedColor, optional long disabledUnselectedColor);
+    field public static final androidx.tv.material3.RadioButtonDefaults INSTANCE;
+  }
+
+  public final class RadioButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void RadioButton(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit>? onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.tv.material3.RadioButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public sealed interface ScrollPauseHandle {
+    method public void resumeAutoScroll();
+  }
+
   public final class ShapeDefaults {
     method public androidx.compose.foundation.shape.CornerBasedShape getExtraLarge();
     method public androidx.compose.foundation.shape.CornerBasedShape getExtraSmall();
@@ -45,10 +449,54 @@
   }
 
   public final class SurfaceKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(optional androidx.compose.ui.Modifier modifier, optional float tonalElevation, optional androidx.compose.ui.graphics.Shape shape, optional androidx.tv.material3.NonInteractiveSurfaceColors colors, optional androidx.tv.material3.Border border, optional androidx.tv.material3.Glow glow, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ToggleableSurfaceShape shape, optional androidx.tv.material3.ToggleableSurfaceColors colors, optional androidx.tv.material3.ToggleableSurfaceScale scale, optional androidx.tv.material3.ToggleableSurfaceBorder border, optional androidx.tv.material3.ToggleableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Surface(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional float tonalElevation, optional androidx.tv.material3.ClickableSurfaceShape shape, optional androidx.tv.material3.ClickableSurfaceColors colors, optional androidx.tv.material3.ClickableSurfaceScale scale, optional androidx.tv.material3.ClickableSurfaceBorder border, optional androidx.tv.material3.ClickableSurfaceGlow glow, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
     method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> getLocalAbsoluteTonalElevation();
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.unit.Dp> LocalAbsoluteTonalElevation;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class SwitchDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.SwitchColors colors(optional long checkedThumbColor, optional long checkedTrackColor, optional long checkedBorderColor, optional long checkedIconColor, optional long uncheckedThumbColor, optional long uncheckedTrackColor, optional long uncheckedBorderColor, optional long uncheckedIconColor, optional long disabledCheckedThumbColor, optional long disabledCheckedTrackColor, optional long disabledCheckedBorderColor, optional long disabledCheckedIconColor, optional long disabledUncheckedThumbColor, optional long disabledUncheckedTrackColor, optional long disabledUncheckedBorderColor, optional long disabledUncheckedIconColor);
+    method public float getIconSize();
+    property public final float IconSize;
+    field public static final androidx.tv.material3.SwitchDefaults INSTANCE;
+  }
+
+  public final class SwitchKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Switch(boolean checked, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit>? onCheckedChange, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit>? thumbContent, optional boolean enabled, optional androidx.tv.material3.SwitchColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabDefaults {
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors pillIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
+    method @androidx.compose.runtime.Composable public androidx.tv.material3.TabColors underlinedIndicatorTabColors(optional long activeContentColor, optional long contentColor, optional long selectedContentColor, optional long focusedContentColor, optional long focusedSelectedContentColor, optional long disabledActiveContentColor, optional long disabledContentColor, optional long disabledSelectedContentColor);
+    field public static final androidx.tv.material3.TabDefaults INSTANCE;
+  }
+
+  public final class TabKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void Tab(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onFocus, optional androidx.compose.ui.Modifier modifier, optional kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional boolean enabled, optional androidx.tv.material3.TabColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class TabRowDefaults {
+    method @androidx.compose.runtime.Composable public void PillIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
+    method @androidx.compose.runtime.Composable public void TabSeparator();
+    method @androidx.compose.runtime.Composable public void UnderlinedIndicator(androidx.compose.ui.unit.DpRect currentTabPosition, optional androidx.compose.ui.Modifier modifier, optional long activeColor, optional long inactiveColor);
+    method @androidx.compose.runtime.Composable public long contentColor();
+    method public long getContainerColor();
+    property public final long ContainerColor;
+    field public static final androidx.tv.material3.TabRowDefaults INSTANCE;
+  }
+
+  public final class TabRowKt {
+    method @androidx.compose.runtime.Composable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void TabRow(int selectedTabIndex, optional androidx.compose.ui.Modifier modifier, optional long containerColor, optional long contentColor, optional kotlin.jvm.functions.Function0<kotlin.Unit> separator, optional kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.unit.DpRect>,kotlin.Unit> indicator, kotlin.jvm.functions.Function0<kotlin.Unit> tabs);
+  }
+
   public final class TextKt {
     method @androidx.compose.runtime.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> content);
     method @androidx.compose.runtime.Composable public static void Text(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional long letterSpacing, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional long lineHeight, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout, optional androidx.compose.ui.text.TextStyle style);
@@ -57,6 +505,30 @@
     property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.text.TextStyle> LocalTextStyle;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceBorder {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceColors {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceDefaults {
+    method public androidx.tv.material3.ToggleableSurfaceBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border selectedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedSelectedBorder, optional androidx.tv.material3.Border focusedDisabledBorder, optional androidx.tv.material3.Border pressedSelectedBorder, optional androidx.tv.material3.Border selectedDisabledBorder, optional androidx.tv.material3.Border focusedSelectedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceColors colors(optional long containerColor, optional long contentColor, optional long focusedContainerColor, optional long focusedContentColor, optional long pressedContainerColor, optional long pressedContentColor, optional long selectedContainerColor, optional long selectedContentColor, optional long disabledContainerColor, optional long disabledContentColor, optional long focusedSelectedContainerColor, optional long focusedSelectedContentColor, optional long pressedSelectedContainerColor, optional long pressedSelectedContentColor);
+    method public androidx.tv.material3.ToggleableSurfaceGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow, optional androidx.tv.material3.Glow selectedGlow, optional androidx.tv.material3.Glow focusedSelectedGlow, optional androidx.tv.material3.Glow pressedSelectedGlow);
+    method public androidx.tv.material3.ToggleableSurfaceScale scale(optional float scale, optional float focusedScale, optional float pressedScale, optional float selectedScale, optional float disabledScale, optional float focusedSelectedScale, optional float focusedDisabledScale, optional float pressedSelectedScale, optional float selectedDisabledScale, optional float focusedSelectedDisabledScale);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ToggleableSurfaceShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape selectedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape, optional androidx.compose.ui.graphics.Shape pressedSelectedShape, optional androidx.compose.ui.graphics.Shape selectedDisabledShape, optional androidx.compose.ui.graphics.Shape focusedSelectedDisabledShape);
+    field public static final androidx.tv.material3.ToggleableSurfaceDefaults INSTANCE;
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceGlow {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceScale {
+  }
+
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class ToggleableSurfaceShape {
+  }
+
   @androidx.compose.runtime.Immutable public final class Typography {
     ctor public Typography(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
     method public androidx.tv.material3.Typography copy(optional androidx.compose.ui.text.TextStyle displayLarge, optional androidx.compose.ui.text.TextStyle displayMedium, optional androidx.compose.ui.text.TextStyle displaySmall, optional androidx.compose.ui.text.TextStyle headlineLarge, optional androidx.compose.ui.text.TextStyle headlineMedium, optional androidx.compose.ui.text.TextStyle headlineSmall, optional androidx.compose.ui.text.TextStyle titleLarge, optional androidx.compose.ui.text.TextStyle titleMedium, optional androidx.compose.ui.text.TextStyle titleSmall, optional androidx.compose.ui.text.TextStyle bodyLarge, optional androidx.compose.ui.text.TextStyle bodyMedium, optional androidx.compose.ui.text.TextStyle bodySmall, optional androidx.compose.ui.text.TextStyle labelLarge, optional androidx.compose.ui.text.TextStyle labelMedium, optional androidx.compose.ui.text.TextStyle labelSmall);
@@ -92,5 +564,23 @@
     property public final androidx.compose.ui.text.TextStyle titleSmall;
   }
 
+  @androidx.compose.runtime.Immutable @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonContentColor {
+  }
+
+  @androidx.tv.material3.ExperimentalTvMaterial3Api public final class WideButtonDefaults {
+    method @androidx.compose.runtime.Composable public void Background(boolean enabled, androidx.compose.foundation.interaction.MutableInteractionSource interactionSource);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.ButtonBorder border(optional androidx.tv.material3.Border border, optional androidx.tv.material3.Border focusedBorder, optional androidx.tv.material3.Border pressedBorder, optional androidx.tv.material3.Border disabledBorder, optional androidx.tv.material3.Border focusedDisabledBorder);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.tv.material3.WideButtonContentColor contentColor(optional long color, optional long focusedColor, optional long pressedColor, optional long disabledColor);
+    method public androidx.tv.material3.ButtonGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
+    method public androidx.tv.material3.ButtonScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale, optional @FloatRange(from=0.0) float disabledScale, optional @FloatRange(from=0.0) float focusedDisabledScale);
+    method public androidx.tv.material3.ButtonShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape, optional androidx.compose.ui.graphics.Shape disabledShape, optional androidx.compose.ui.graphics.Shape focusedDisabledShape);
+    field public static final androidx.tv.material3.WideButtonDefaults INSTANCE;
+  }
+
+  public final class WideButtonKt {
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> content);
+    method @androidx.compose.runtime.Composable @androidx.compose.runtime.NonRestartableComposable @androidx.tv.material3.ExperimentalTvMaterial3Api public static void WideButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> title, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional kotlin.jvm.functions.Function0<kotlin.Unit>? icon, optional kotlin.jvm.functions.Function0<kotlin.Unit>? subtitle, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional kotlin.jvm.functions.Function0<kotlin.Unit> background, optional androidx.tv.material3.ButtonScale scale, optional androidx.tv.material3.ButtonGlow glow, optional androidx.tv.material3.ButtonShape shape, optional androidx.tv.material3.WideButtonContentColor contentColor, optional float tonalElevation, optional androidx.tv.material3.ButtonBorder border, optional androidx.compose.foundation.layout.PaddingValues contentPadding);
+  }
+
 }
 
diff --git a/tvprovider/tvprovider/api/public_plus_experimental_current.txt b/tvprovider/tvprovider/api/public_plus_experimental_current.txt
deleted file mode 100644
index c82fb20..0000000
--- a/tvprovider/tvprovider/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,890 +0,0 @@
-// Signature format: 4.0
-package androidx.tvprovider.media.tv {
-
-  public final class Channel {
-    method public static androidx.tvprovider.media.tv.Channel! fromCursor(android.database.Cursor!);
-    method public int getAppLinkColor();
-    method public android.net.Uri! getAppLinkIconUri();
-    method public android.content.Intent! getAppLinkIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getAppLinkIntentUri();
-    method public android.net.Uri! getAppLinkPosterArtUri();
-    method public String! getAppLinkText();
-    method public int getConfigurationDisplayOrder();
-    method public String! getDescription();
-    method public String! getDisplayName();
-    method public String! getDisplayNumber();
-    method public String? getGlobalContentId();
-    method public long getId();
-    method public String! getInputId();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getInternalProviderId();
-    method public String! getNetworkAffiliation();
-    method public int getOriginalNetworkId();
-    method public String! getPackageName();
-    method public int getServiceId();
-    method public String! getServiceType();
-    method public String! getSystemChannelKey();
-    method public int getTransportStreamId();
-    method public String! getType();
-    method public String! getVideoFormat();
-    method public boolean isBrowsable();
-    method public boolean isLocked();
-    method public boolean isSearchable();
-    method public boolean isTransient();
-    method public android.content.ContentValues! toContentValues();
-  }
-
-  public static final class Channel.Builder {
-    ctor public Channel.Builder();
-    ctor public Channel.Builder(androidx.tvprovider.media.tv.Channel!);
-    method public androidx.tvprovider.media.tv.Channel! build();
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkColor(int);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkIconUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setAppLinkText(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setConfigurationDisplayOrder(int);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setDisplayName(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setDisplayNumber(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder setGlobalContentId(String);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInputId(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderData(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setNetworkAffiliation(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setOriginalNetworkId(int);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setServiceId(int);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setServiceType(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setSystemChannelKey(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setTransportStreamId(int);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setType(String!);
-    method public androidx.tvprovider.media.tv.Channel.Builder! setVideoFormat(String!);
-  }
-
-  @WorkerThread public class ChannelLogoUtils {
-    ctor @Deprecated public ChannelLogoUtils();
-    method @WorkerThread public static android.graphics.Bitmap? loadChannelLogo(android.content.Context, long);
-    method @WorkerThread public static boolean storeChannelLogo(android.content.Context, long, android.graphics.Bitmap);
-    method public static boolean storeChannelLogo(android.content.Context, long, android.net.Uri);
-  }
-
-  public class PreviewChannel {
-    method public static androidx.tvprovider.media.tv.PreviewChannel! fromCursor(android.database.Cursor!);
-    method public android.content.Intent! getAppLinkIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getAppLinkIntentUri();
-    method public CharSequence! getDescription();
-    method public CharSequence! getDisplayName();
-    method public long getId();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getInternalProviderId();
-    method @WorkerThread public android.graphics.Bitmap! getLogo(android.content.Context!);
-    method public String! getPackageName();
-    method public String! getType();
-    method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.PreviewChannel!);
-    method public boolean isBrowsable();
-  }
-
-  public static final class PreviewChannel.Builder {
-    ctor public PreviewChannel.Builder();
-    ctor public PreviewChannel.Builder(androidx.tvprovider.media.tv.PreviewChannel!);
-    method public androidx.tvprovider.media.tv.PreviewChannel! build();
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setAppLinkIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setAppLinkIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder setDescription(CharSequence?);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setDisplayName(CharSequence!);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setLogo(android.graphics.Bitmap);
-    method public androidx.tvprovider.media.tv.PreviewChannel.Builder! setLogo(android.net.Uri);
-  }
-
-  @WorkerThread public class PreviewChannelHelper {
-    ctor public PreviewChannelHelper(android.content.Context!);
-    ctor public PreviewChannelHelper(android.content.Context!, int, int);
-    method public void deletePreviewChannel(long);
-    method public void deletePreviewProgram(long);
-    method protected android.graphics.Bitmap! downloadBitmap(android.net.Uri) throws java.io.IOException;
-    method public java.util.List<androidx.tvprovider.media.tv.PreviewChannel!>! getAllChannels();
-    method public androidx.tvprovider.media.tv.PreviewChannel? getPreviewChannel(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram? getPreviewProgram(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram? getWatchNextProgram(long);
-    method public long publishChannel(androidx.tvprovider.media.tv.PreviewChannel) throws java.io.IOException;
-    method public long publishDefaultChannel(androidx.tvprovider.media.tv.PreviewChannel) throws java.io.IOException;
-    method public long publishPreviewProgram(androidx.tvprovider.media.tv.PreviewProgram);
-    method public long publishWatchNextProgram(androidx.tvprovider.media.tv.WatchNextProgram);
-    method public void updatePreviewChannel(long, androidx.tvprovider.media.tv.PreviewChannel) throws java.io.IOException;
-    method public void updatePreviewProgram(long, androidx.tvprovider.media.tv.PreviewProgram);
-    method public void updateWatchNextProgram(androidx.tvprovider.media.tv.WatchNextProgram, long);
-  }
-
-  public final class PreviewProgram {
-    method public static androidx.tvprovider.media.tv.PreviewProgram! fromCursor(android.database.Cursor!);
-    method public String![]! getAudioLanguages();
-    method public String! getAuthor();
-    method public int getAvailability();
-    method public String![]! getCanonicalGenres();
-    method public long getChannelId();
-    method public String! getContentId();
-    method public android.media.tv.TvContentRating![]! getContentRatings();
-    method public String! getDescription();
-    method public int getDurationMillis();
-    method public long getEndTimeUtcMillis();
-    method public String! getEpisodeNumber();
-    method public String! getEpisodeTitle();
-    method public String! getGenre();
-    method public long getId();
-    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getIntentUri();
-    method public long getInteractionCount();
-    method public int getInteractionType();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getInternalProviderId();
-    method public int getItemCount();
-    method public int getLastPlaybackPositionMillis();
-    method public String! getLogoContentDescription();
-    method public android.net.Uri! getLogoUri();
-    method public String! getLongDescription();
-    method public String! getOfferPrice();
-    method public int getPosterArtAspectRatio();
-    method public android.net.Uri! getPosterArtUri();
-    method public android.net.Uri! getPreviewAudioUri();
-    method public android.net.Uri! getPreviewVideoUri();
-    method public String! getReleaseDate();
-    method public String! getReviewRating();
-    method public int getReviewRatingStyle();
-    method public String! getSeasonNumber();
-    method public String! getSeasonTitle();
-    method public String? getSeriesId();
-    method public long getStartTimeUtcMillis();
-    method public String! getStartingPrice();
-    method public int getThumbnailAspectRatio();
-    method public android.net.Uri! getThumbnailUri();
-    method public String! getTitle();
-    method public int getTvSeriesItemType();
-    method public int getType();
-    method public int getVideoHeight();
-    method public int getVideoWidth();
-    method public int getWeight();
-    method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.PreviewProgram!);
-    method public boolean isBrowsable();
-    method public boolean isLive();
-    method public boolean isSearchable();
-    method public boolean isTransient();
-    method public android.content.ContentValues! toContentValues();
-  }
-
-  public static final class PreviewProgram.Builder {
-    ctor public PreviewProgram.Builder();
-    ctor public PreviewProgram.Builder(androidx.tvprovider.media.tv.PreviewProgram!);
-    method public androidx.tvprovider.media.tv.PreviewProgram! build();
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAudioLanguages(String![]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setCanonicalGenres(String![]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentRatings(android.media.tv.TvContentRating![]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setItemCount(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder setSeriesId(String?);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoWidth(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setWeight(int);
-  }
-
-  public final class Program implements java.lang.Comparable<androidx.tvprovider.media.tv.Program> {
-    method public int compareTo(androidx.tvprovider.media.tv.Program);
-    method public static androidx.tvprovider.media.tv.Program! fromCursor(android.database.Cursor!);
-    method public String![]! getAudioLanguages();
-    method public String![]! getBroadcastGenres();
-    method public String![]! getCanonicalGenres();
-    method public long getChannelId();
-    method public android.media.tv.TvContentRating![]! getContentRatings();
-    method public String! getDescription();
-    method public long getEndTimeUtcMillis();
-    method public String! getEpisodeNumber();
-    method public String! getEpisodeTitle();
-    method public int getEventId();
-    method public String? getGlobalContentId();
-    method public long getId();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getLongDescription();
-    method public android.net.Uri! getPosterArtUri();
-    method public String! getReviewRating();
-    method public int getReviewRatingStyle();
-    method public String! getSeasonNumber();
-    method public String! getSeasonTitle();
-    method public String? getSeriesId();
-    method public long getStartTimeUtcMillis();
-    method public android.net.Uri! getThumbnailUri();
-    method public String! getTitle();
-    method public int getVideoHeight();
-    method public int getVideoWidth();
-    method public boolean isRecordingProhibited();
-    method public boolean isSearchable();
-    method public android.content.ContentValues! toContentValues();
-  }
-
-  public static class Program.Builder {
-    ctor public Program.Builder();
-    ctor public Program.Builder(androidx.tvprovider.media.tv.Program!);
-    method public androidx.tvprovider.media.tv.Program! build();
-    method public androidx.tvprovider.media.tv.Program.Builder! setAudioLanguages(String![]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setBroadcastGenres(String![]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setCanonicalGenres(String![]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setContentRatings(android.media.tv.TvContentRating![]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder setEventId(int);
-    method public androidx.tvprovider.media.tv.Program.Builder setGlobalContentId(String?);
-    method public androidx.tvprovider.media.tv.Program.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setRecordingProhibited(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder setSeriesId(String?);
-    method public androidx.tvprovider.media.tv.Program.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoWidth(int);
-  }
-
-  public final class TvContractCompat {
-    method public static android.net.Uri! buildChannelLogoUri(android.net.Uri!);
-    method public static android.net.Uri! buildChannelLogoUri(long);
-    method public static android.net.Uri! buildChannelUri(long);
-    method public static android.net.Uri! buildChannelUriForPassthroughInput(String!);
-    method public static android.net.Uri! buildChannelsUriForInput(String?);
-    method public static String! buildInputId(android.content.ComponentName!);
-    method public static android.net.Uri! buildPreviewProgramUri(long);
-    method public static android.net.Uri! buildPreviewProgramsUriForChannel(android.net.Uri!);
-    method public static android.net.Uri! buildPreviewProgramsUriForChannel(long);
-    method public static android.net.Uri! buildProgramUri(long);
-    method public static android.net.Uri! buildProgramsUriForChannel(android.net.Uri!);
-    method public static android.net.Uri! buildProgramsUriForChannel(android.net.Uri!, long, long);
-    method public static android.net.Uri! buildProgramsUriForChannel(long);
-    method public static android.net.Uri! buildProgramsUriForChannel(long, long, long);
-    method public static android.net.Uri! buildRecordedProgramUri(long);
-    method public static android.net.Uri! buildWatchNextProgramUri(long);
-    method public static boolean isChannelUri(android.net.Uri!);
-    method public static boolean isChannelUriForPassthroughInput(android.net.Uri!);
-    method public static boolean isChannelUriForTunerInput(android.net.Uri!);
-    method public static boolean isProgramUri(android.net.Uri!);
-    method public static boolean isRecordedProgramUri(android.net.Uri!);
-    method public static void requestChannelBrowsable(android.content.Context!, long);
-    field public static final String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";
-    field public static final String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";
-    field public static final String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";
-    field public static final String ACTION_REQUEST_CHANNEL_BROWSABLE = "android.media.tv.action.REQUEST_CHANNEL_BROWSABLE";
-    field public static final String ACTION_WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED";
-    field public static final String AUTHORITY = "android.media.tv";
-    field public static final String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";
-    field public static final String EXTRA_PREVIEW_PROGRAM_ID = "android.media.tv.extra.PREVIEW_PROGRAM_ID";
-    field public static final String EXTRA_WATCH_NEXT_PROGRAM_ID = "android.media.tv.extra.WATCH_NEXT_PROGRAM_ID";
-  }
-
-  public static interface TvContractCompat.BaseTvColumns extends android.provider.BaseColumns {
-    field public static final String COLUMN_PACKAGE_NAME = "package_name";
-  }
-
-  public static final class TvContractCompat.Channels implements androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns {
-    method public static String? getVideoResolution(String!);
-    field public static final String COLUMN_APP_LINK_COLOR = "app_link_color";
-    field public static final String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";
-    field public static final String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
-    field public static final String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
-    field public static final String COLUMN_APP_LINK_TEXT = "app_link_text";
-    field public static final String COLUMN_BROWSABLE = "browsable";
-    field public static final String COLUMN_CONFIGURATION_DISPLAY_ORDER = "configuration_display_order";
-    field public static final String COLUMN_DESCRIPTION = "description";
-    field public static final String COLUMN_DISPLAY_NAME = "display_name";
-    field public static final String COLUMN_DISPLAY_NUMBER = "display_number";
-    field public static final String COLUMN_GLOBAL_CONTENT_ID = "global_content_id";
-    field public static final String COLUMN_INPUT_ID = "input_id";
-    field public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
-    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";
-    field public static final String COLUMN_LOCKED = "locked";
-    field public static final String COLUMN_NETWORK_AFFILIATION = "network_affiliation";
-    field public static final String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
-    field public static final String COLUMN_SEARCHABLE = "searchable";
-    field public static final String COLUMN_SERVICE_ID = "service_id";
-    field public static final String COLUMN_SERVICE_TYPE = "service_type";
-    field public static final String COLUMN_SYSTEM_CHANNEL_KEY = "system_channel_key";
-    field public static final String COLUMN_TRANSIENT = "transient";
-    field public static final String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
-    field public static final String COLUMN_TYPE = "type";
-    field public static final String COLUMN_VERSION_NUMBER = "version_number";
-    field public static final String COLUMN_VIDEO_FORMAT = "video_format";
-    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/channel";
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/channel";
-    field public static final android.net.Uri! CONTENT_URI;
-    field public static final String SERVICE_TYPE_AUDIO = "SERVICE_TYPE_AUDIO";
-    field public static final String SERVICE_TYPE_AUDIO_VIDEO = "SERVICE_TYPE_AUDIO_VIDEO";
-    field public static final String SERVICE_TYPE_OTHER = "SERVICE_TYPE_OTHER";
-    field public static final String TYPE_1SEG = "TYPE_1SEG";
-    field public static final String TYPE_ATSC_C = "TYPE_ATSC_C";
-    field public static final String TYPE_ATSC_M_H = "TYPE_ATSC_M_H";
-    field public static final String TYPE_ATSC_T = "TYPE_ATSC_T";
-    field public static final String TYPE_CMMB = "TYPE_CMMB";
-    field public static final String TYPE_DTMB = "TYPE_DTMB";
-    field public static final String TYPE_DVB_C = "TYPE_DVB_C";
-    field public static final String TYPE_DVB_C2 = "TYPE_DVB_C2";
-    field public static final String TYPE_DVB_H = "TYPE_DVB_H";
-    field public static final String TYPE_DVB_S = "TYPE_DVB_S";
-    field public static final String TYPE_DVB_S2 = "TYPE_DVB_S2";
-    field public static final String TYPE_DVB_SH = "TYPE_DVB_SH";
-    field public static final String TYPE_DVB_T = "TYPE_DVB_T";
-    field public static final String TYPE_DVB_T2 = "TYPE_DVB_T2";
-    field public static final String TYPE_ISDB_C = "TYPE_ISDB_C";
-    field public static final String TYPE_ISDB_S = "TYPE_ISDB_S";
-    field public static final String TYPE_ISDB_T = "TYPE_ISDB_T";
-    field public static final String TYPE_ISDB_TB = "TYPE_ISDB_TB";
-    field public static final String TYPE_NTSC = "TYPE_NTSC";
-    field public static final String TYPE_OTHER = "TYPE_OTHER";
-    field public static final String TYPE_PAL = "TYPE_PAL";
-    field public static final String TYPE_PREVIEW = "TYPE_PREVIEW";
-    field public static final String TYPE_SECAM = "TYPE_SECAM";
-    field public static final String TYPE_S_DMB = "TYPE_S_DMB";
-    field public static final String TYPE_T_DMB = "TYPE_T_DMB";
-    field public static final String VIDEO_FORMAT_1080I = "VIDEO_FORMAT_1080I";
-    field public static final String VIDEO_FORMAT_1080P = "VIDEO_FORMAT_1080P";
-    field public static final String VIDEO_FORMAT_2160P = "VIDEO_FORMAT_2160P";
-    field public static final String VIDEO_FORMAT_240P = "VIDEO_FORMAT_240P";
-    field public static final String VIDEO_FORMAT_360P = "VIDEO_FORMAT_360P";
-    field public static final String VIDEO_FORMAT_4320P = "VIDEO_FORMAT_4320P";
-    field public static final String VIDEO_FORMAT_480I = "VIDEO_FORMAT_480I";
-    field public static final String VIDEO_FORMAT_480P = "VIDEO_FORMAT_480P";
-    field public static final String VIDEO_FORMAT_576I = "VIDEO_FORMAT_576I";
-    field public static final String VIDEO_FORMAT_576P = "VIDEO_FORMAT_576P";
-    field public static final String VIDEO_FORMAT_720P = "VIDEO_FORMAT_720P";
-    field public static final String VIDEO_RESOLUTION_ED = "VIDEO_RESOLUTION_ED";
-    field public static final String VIDEO_RESOLUTION_FHD = "VIDEO_RESOLUTION_FHD";
-    field public static final String VIDEO_RESOLUTION_HD = "VIDEO_RESOLUTION_HD";
-    field public static final String VIDEO_RESOLUTION_SD = "VIDEO_RESOLUTION_SD";
-    field public static final String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";
-  }
-
-  public static final class TvContractCompat.Channels.Logo {
-    field public static final String CONTENT_DIRECTORY = "logo";
-  }
-
-  public static final class TvContractCompat.PreviewPrograms implements androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns {
-    field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
-    field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
-    field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
-    field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
-    field public static final int ASPECT_RATIO_3_4 = 6; // 0x6
-    field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
-    field public static final int ASPECT_RATIO_MOVIE_POSTER = 5; // 0x5
-    field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
-    field public static final int AVAILABILITY_FREE = 4; // 0x4
-    field public static final int AVAILABILITY_FREE_WITH_ADS = 5; // 0x5
-    field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
-    field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
-    field public static final int AVAILABILITY_PURCHASED = 3; // 0x3
-    field public static final String COLUMN_AUDIO_LANGUAGE = "audio_language";
-    field public static final String COLUMN_AUTHOR = "author";
-    field public static final String COLUMN_AVAILABILITY = "availability";
-    field public static final String COLUMN_BROWSABLE = "browsable";
-    field public static final String COLUMN_CANONICAL_GENRE = "canonical_genre";
-    field public static final String COLUMN_CHANNEL_ID = "channel_id";
-    field public static final String COLUMN_CONTENT_ID = "content_id";
-    field public static final String COLUMN_CONTENT_RATING = "content_rating";
-    field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
-    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
-    field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
-    field public static final String COLUMN_EPISODE_TITLE = "episode_title";
-    field public static final String COLUMN_GENRE = "genre";
-    field public static final String COLUMN_INTENT_URI = "intent_uri";
-    field public static final String COLUMN_INTERACTION_COUNT = "interaction_count";
-    field public static final String COLUMN_INTERACTION_TYPE = "interaction_type";
-    field public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
-    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";
-    field public static final String COLUMN_ITEM_COUNT = "item_count";
-    field public static final String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";
-    field public static final String COLUMN_LIVE = "live";
-    field public static final String COLUMN_LOGO_CONTENT_DESCRIPTION = "logo_content_description";
-    field public static final String COLUMN_LOGO_URI = "logo_uri";
-    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
-    field public static final String COLUMN_OFFER_PRICE = "offer_price";
-    field public static final String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";
-    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
-    field public static final String COLUMN_PREVIEW_AUDIO_URI = "preview_audio_uri";
-    field public static final String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";
-    field public static final String COLUMN_RELEASE_DATE = "release_date";
-    field public static final String COLUMN_REVIEW_RATING = "review_rating";
-    field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
-    field public static final String COLUMN_SEARCHABLE = "searchable";
-    field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
-    field public static final String COLUMN_SEASON_TITLE = "season_title";
-    field public static final String COLUMN_SERIES_ID = "series_id";
-    field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
-    field public static final String COLUMN_STARTING_PRICE = "starting_price";
-    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
-    field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
-    field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
-    field public static final String COLUMN_TITLE = "title";
-    field public static final String COLUMN_TRANSIENT = "transient";
-    field public static final String COLUMN_TV_SERIES_ITEM_TYPE = "tv_series_item_type";
-    field public static final String COLUMN_TYPE = "type";
-    field public static final String COLUMN_VERSION_NUMBER = "version_number";
-    field public static final String COLUMN_VIDEO_HEIGHT = "video_height";
-    field public static final String COLUMN_VIDEO_WIDTH = "video_width";
-    field public static final String COLUMN_WEIGHT = "weight";
-    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/preview_program";
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/preview_program";
-    field public static final android.net.Uri! CONTENT_URI;
-    field public static final int INTERACTION_TYPE_FANS = 3; // 0x3
-    field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
-    field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
-    field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
-    field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
-    field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
-    field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
-    field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
-    field public static final int TV_SERIES_ITEM_TYPE_CHAPTER = 1; // 0x1
-    field public static final int TV_SERIES_ITEM_TYPE_EPISODE = 0; // 0x0
-    field public static final int TYPE_ALBUM = 8; // 0x8
-    field public static final int TYPE_ARTIST = 9; // 0x9
-    field public static final int TYPE_CHANNEL = 6; // 0x6
-    field public static final int TYPE_CLIP = 4; // 0x4
-    field public static final int TYPE_EVENT = 5; // 0x5
-    field public static final int TYPE_GAME = 12; // 0xc
-    field public static final int TYPE_MOVIE = 0; // 0x0
-    field public static final int TYPE_PLAYLIST = 10; // 0xa
-    field public static final int TYPE_STATION = 11; // 0xb
-    field public static final int TYPE_TRACK = 7; // 0x7
-    field public static final int TYPE_TV_EPISODE = 3; // 0x3
-    field public static final int TYPE_TV_SEASON = 2; // 0x2
-    field public static final int TYPE_TV_SERIES = 1; // 0x1
-  }
-
-  public static final class TvContractCompat.Programs implements androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns {
-    field public static final String COLUMN_AUDIO_LANGUAGE = "audio_language";
-    field public static final String COLUMN_BROADCAST_GENRE = "broadcast_genre";
-    field public static final String COLUMN_CANONICAL_GENRE = "canonical_genre";
-    field public static final String COLUMN_CHANNEL_ID = "channel_id";
-    field public static final String COLUMN_CONTENT_RATING = "content_rating";
-    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
-    field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
-    field @Deprecated public static final String COLUMN_EPISODE_NUMBER = "episode_number";
-    field public static final String COLUMN_EPISODE_TITLE = "episode_title";
-    field public static final String COLUMN_EVENT_ID = "event_id";
-    field public static final String COLUMN_GLOBAL_CONTENT_ID = "global_content_id";
-    field public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
-    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
-    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
-    field public static final String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";
-    field public static final String COLUMN_REVIEW_RATING = "review_rating";
-    field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
-    field public static final String COLUMN_SEARCHABLE = "searchable";
-    field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
-    field @Deprecated public static final String COLUMN_SEASON_NUMBER = "season_number";
-    field public static final String COLUMN_SEASON_TITLE = "season_title";
-    field public static final String COLUMN_SERIES_ID = "series_id";
-    field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
-    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
-    field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
-    field public static final String COLUMN_TITLE = "title";
-    field public static final String COLUMN_VERSION_NUMBER = "version_number";
-    field public static final String COLUMN_VIDEO_HEIGHT = "video_height";
-    field public static final String COLUMN_VIDEO_WIDTH = "video_width";
-    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/program";
-    field public static final android.net.Uri! CONTENT_URI;
-    field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
-    field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
-  }
-
-  public static final class TvContractCompat.Programs.Genres {
-    method public static String![]! decode(String);
-    method public static String! encode(java.lang.String!...);
-    method public static boolean isCanonical(String!);
-    field public static final String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE";
-    field public static final String ARTS = "ARTS";
-    field public static final String COMEDY = "COMEDY";
-    field public static final String DRAMA = "DRAMA";
-    field public static final String EDUCATION = "EDUCATION";
-    field public static final String ENTERTAINMENT = "ENTERTAINMENT";
-    field public static final String FAMILY_KIDS = "FAMILY_KIDS";
-    field public static final String GAMING = "GAMING";
-    field public static final String LIFE_STYLE = "LIFE_STYLE";
-    field public static final String MOVIES = "MOVIES";
-    field public static final String MUSIC = "MUSIC";
-    field public static final String NEWS = "NEWS";
-    field public static final String PREMIER = "PREMIER";
-    field public static final String SHOPPING = "SHOPPING";
-    field public static final String SPORTS = "SPORTS";
-    field public static final String TECH_SCIENCE = "TECH_SCIENCE";
-    field public static final String TRAVEL = "TRAVEL";
-  }
-
-  public static final class TvContractCompat.RecordedPrograms implements androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns {
-    field public static final String COLUMN_AUDIO_LANGUAGE = "audio_language";
-    field public static final String COLUMN_BROADCAST_GENRE = "broadcast_genre";
-    field public static final String COLUMN_CANONICAL_GENRE = "canonical_genre";
-    field public static final String COLUMN_CHANNEL_ID = "channel_id";
-    field public static final String COLUMN_CONTENT_RATING = "content_rating";
-    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
-    field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
-    field public static final String COLUMN_EPISODE_TITLE = "episode_title";
-    field public static final String COLUMN_INPUT_ID = "input_id";
-    field public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
-    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
-    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
-    field public static final String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";
-    field public static final String COLUMN_RECORDING_DATA_URI = "recording_data_uri";
-    field public static final String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
-    field public static final String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
-    field public static final String COLUMN_REVIEW_RATING = "review_rating";
-    field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
-    field public static final String COLUMN_SEARCHABLE = "searchable";
-    field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
-    field public static final String COLUMN_SEASON_TITLE = "season_title";
-    field public static final String COLUMN_SERIES_ID = "series_id";
-    field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
-    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
-    field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
-    field public static final String COLUMN_TITLE = "title";
-    field public static final String COLUMN_VERSION_NUMBER = "version_number";
-    field public static final String COLUMN_VIDEO_HEIGHT = "video_height";
-    field public static final String COLUMN_VIDEO_WIDTH = "video_width";
-    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/recorded_program";
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/recorded_program";
-    field public static final android.net.Uri! CONTENT_URI;
-    field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
-    field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
-  }
-
-  public static final class TvContractCompat.WatchNextPrograms implements androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns {
-    field public static final int ASPECT_RATIO_16_9 = 0; // 0x0
-    field public static final int ASPECT_RATIO_1_1 = 3; // 0x3
-    field public static final int ASPECT_RATIO_2_3 = 4; // 0x4
-    field public static final int ASPECT_RATIO_3_2 = 1; // 0x1
-    field public static final int ASPECT_RATIO_3_4 = 6; // 0x6
-    field public static final int ASPECT_RATIO_4_3 = 2; // 0x2
-    field public static final int ASPECT_RATIO_MOVIE_POSTER = 5; // 0x5
-    field public static final int AVAILABILITY_AVAILABLE = 0; // 0x0
-    field public static final int AVAILABILITY_FREE = 4; // 0x4
-    field public static final int AVAILABILITY_FREE_WITH_ADS = 5; // 0x5
-    field public static final int AVAILABILITY_FREE_WITH_SUBSCRIPTION = 1; // 0x1
-    field public static final int AVAILABILITY_PAID_CONTENT = 2; // 0x2
-    field public static final int AVAILABILITY_PURCHASED = 3; // 0x3
-    field public static final String COLUMN_AUDIO_LANGUAGE = "audio_language";
-    field public static final String COLUMN_AUTHOR = "author";
-    field public static final String COLUMN_AVAILABILITY = "availability";
-    field public static final String COLUMN_BROWSABLE = "browsable";
-    field public static final String COLUMN_CANONICAL_GENRE = "canonical_genre";
-    field public static final String COLUMN_CONTENT_ID = "content_id";
-    field public static final String COLUMN_CONTENT_RATING = "content_rating";
-    field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
-    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
-    field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
-    field public static final String COLUMN_EPISODE_TITLE = "episode_title";
-    field public static final String COLUMN_GENRE = "genre";
-    field public static final String COLUMN_INTENT_URI = "intent_uri";
-    field public static final String COLUMN_INTERACTION_COUNT = "interaction_count";
-    field public static final String COLUMN_INTERACTION_TYPE = "interaction_type";
-    field public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
-    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
-    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";
-    field public static final String COLUMN_ITEM_COUNT = "item_count";
-    field public static final String COLUMN_LAST_ENGAGEMENT_TIME_UTC_MILLIS = "last_engagement_time_utc_millis";
-    field public static final String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";
-    field public static final String COLUMN_LIVE = "live";
-    field public static final String COLUMN_LOGO_CONTENT_DESCRIPTION = "logo_content_description";
-    field public static final String COLUMN_LOGO_URI = "logo_uri";
-    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
-    field public static final String COLUMN_OFFER_PRICE = "offer_price";
-    field public static final String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";
-    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
-    field public static final String COLUMN_PREVIEW_AUDIO_URI = "preview_audio_uri";
-    field public static final String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";
-    field public static final String COLUMN_RELEASE_DATE = "release_date";
-    field public static final String COLUMN_REVIEW_RATING = "review_rating";
-    field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
-    field public static final String COLUMN_SEARCHABLE = "searchable";
-    field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
-    field public static final String COLUMN_SEASON_TITLE = "season_title";
-    field public static final String COLUMN_SERIES_ID = "series_id";
-    field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
-    field public static final String COLUMN_STARTING_PRICE = "starting_price";
-    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
-    field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
-    field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
-    field public static final String COLUMN_TITLE = "title";
-    field public static final String COLUMN_TRANSIENT = "transient";
-    field public static final String COLUMN_TV_SERIES_ITEM_TYPE = "tv_series_item_type";
-    field public static final String COLUMN_TYPE = "type";
-    field public static final String COLUMN_VERSION_NUMBER = "version_number";
-    field public static final String COLUMN_VIDEO_HEIGHT = "video_height";
-    field public static final String COLUMN_VIDEO_WIDTH = "video_width";
-    field public static final String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";
-    field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/watch_next_program";
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/watch_next_program";
-    field public static final android.net.Uri! CONTENT_URI;
-    field public static final int INTERACTION_TYPE_FANS = 3; // 0x3
-    field public static final int INTERACTION_TYPE_FOLLOWERS = 2; // 0x2
-    field public static final int INTERACTION_TYPE_LIKES = 4; // 0x4
-    field public static final int INTERACTION_TYPE_LISTENS = 1; // 0x1
-    field public static final int INTERACTION_TYPE_THUMBS = 5; // 0x5
-    field public static final int INTERACTION_TYPE_VIEWERS = 6; // 0x6
-    field public static final int INTERACTION_TYPE_VIEWS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_PERCENTAGE = 2; // 0x2
-    field public static final int REVIEW_RATING_STYLE_STARS = 0; // 0x0
-    field public static final int REVIEW_RATING_STYLE_THUMBS_UP_DOWN = 1; // 0x1
-    field public static final int TV_SERIES_ITEM_TYPE_CHAPTER = 1; // 0x1
-    field public static final int TV_SERIES_ITEM_TYPE_EPISODE = 0; // 0x0
-    field public static final int TYPE_ALBUM = 8; // 0x8
-    field public static final int TYPE_ARTIST = 9; // 0x9
-    field public static final int TYPE_CHANNEL = 6; // 0x6
-    field public static final int TYPE_CLIP = 4; // 0x4
-    field public static final int TYPE_EVENT = 5; // 0x5
-    field public static final int TYPE_GAME = 12; // 0xc
-    field public static final int TYPE_MOVIE = 0; // 0x0
-    field public static final int TYPE_PLAYLIST = 10; // 0xa
-    field public static final int TYPE_STATION = 11; // 0xb
-    field public static final int TYPE_TRACK = 7; // 0x7
-    field public static final int TYPE_TV_EPISODE = 3; // 0x3
-    field public static final int TYPE_TV_SEASON = 2; // 0x2
-    field public static final int TYPE_TV_SERIES = 1; // 0x1
-    field public static final int WATCH_NEXT_TYPE_CONTINUE = 0; // 0x0
-    field public static final int WATCH_NEXT_TYPE_NEW = 2; // 0x2
-    field public static final int WATCH_NEXT_TYPE_NEXT = 1; // 0x1
-    field public static final int WATCH_NEXT_TYPE_WATCHLIST = 3; // 0x3
-  }
-
-  public final class WatchNextProgram {
-    method public static androidx.tvprovider.media.tv.WatchNextProgram! fromCursor(android.database.Cursor!);
-    method public String![]! getAudioLanguages();
-    method public String! getAuthor();
-    method public int getAvailability();
-    method public String![]! getCanonicalGenres();
-    method public String! getContentId();
-    method public android.media.tv.TvContentRating![]! getContentRatings();
-    method public String! getDescription();
-    method public int getDurationMillis();
-    method public long getEndTimeUtcMillis();
-    method public String! getEpisodeNumber();
-    method public String! getEpisodeTitle();
-    method public String! getGenre();
-    method public long getId();
-    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getIntentUri();
-    method public long getInteractionCount();
-    method public int getInteractionType();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getInternalProviderId();
-    method public int getItemCount();
-    method public long getLastEngagementTimeUtcMillis();
-    method public int getLastPlaybackPositionMillis();
-    method public String! getLogoContentDescription();
-    method public android.net.Uri! getLogoUri();
-    method public String! getLongDescription();
-    method public String! getOfferPrice();
-    method public int getPosterArtAspectRatio();
-    method public android.net.Uri! getPosterArtUri();
-    method public android.net.Uri! getPreviewAudioUri();
-    method public android.net.Uri! getPreviewVideoUri();
-    method public String! getReleaseDate();
-    method public String! getReviewRating();
-    method public int getReviewRatingStyle();
-    method public String! getSeasonNumber();
-    method public String! getSeasonTitle();
-    method public String? getSeriesId();
-    method public long getStartTimeUtcMillis();
-    method public String! getStartingPrice();
-    method public int getThumbnailAspectRatio();
-    method public android.net.Uri! getThumbnailUri();
-    method public String! getTitle();
-    method public int getTvSeriesItemType();
-    method public int getType();
-    method public int getVideoHeight();
-    method public int getVideoWidth();
-    method public int getWatchNextType();
-    method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.WatchNextProgram!);
-    method public boolean isBrowsable();
-    method public boolean isLive();
-    method public boolean isSearchable();
-    method public boolean isTransient();
-    method public android.content.ContentValues! toContentValues();
-    field public static final int WATCH_NEXT_TYPE_UNKNOWN = -1; // 0xffffffff
-  }
-
-  public static final class WatchNextProgram.Builder {
-    ctor public WatchNextProgram.Builder();
-    ctor public WatchNextProgram.Builder(androidx.tvprovider.media.tv.WatchNextProgram!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram! build();
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAudioLanguages(String![]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setCanonicalGenres(String![]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentRatings(android.media.tv.TvContentRating![]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setItemCount(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastEngagementTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder setSeriesId(String?);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoWidth(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setWatchNextType(int);
-  }
-
-}
-