Merge "Opt-in h- thru m-prefixed projects to Suppress Compatibility migration" into androidx-main am: 77e3281049

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

Change-Id: I0c574d4cc082e0d4ef576f93500ee2b6e7ec6c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/gradle.properties b/gradle.properties
index 76eb9c6..9f0acfe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,8 +45,8 @@
 androidx.suppress.compatibility.optin.defg=d,e,f,g
 
 # Third stage of Suppress Compatibility migration
-# androidx.suppress.compatibility.optout.hijklm=
-# androidx.suppress.compatibility.optin.hijklm=h,i,j,k,l,m
+androidx.suppress.compatibility.optout.hijklm=health/connect/connect-client/,heifwriter/heifwriter/,hilt/hilt-navigation-fragment/,media/media/,mediarouter/mediarouter/
+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/
diff --git a/health/health-services-client/api/public_plus_experimental_1.0.0-beta04.txt b/health/health-services-client/api/public_plus_experimental_1.0.0-beta04.txt
deleted file mode 100644
index 92e1fab..0000000
--- a/health/health-services-client/api/public_plus_experimental_1.0.0-beta04.txt
+++ /dev/null
@@ -1,910 +0,0 @@
-// Signature format: 4.0
-package androidx.health.services.client {
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface ExerciseClient {
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> addGoalToActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearUpdateCallbackAsync(androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> endExerciseAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> getCapabilitiesAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseInfo> getCurrentExerciseInfoAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> markLapAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideAutoPauseAndResumeForActiveExerciseAsync(boolean enabled);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideBatchingModesForActiveExerciseAsync(java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModes);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> pauseExerciseAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> prepareExerciseAsync(androidx.health.services.client.data.WarmUpConfig configuration);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> removeGoalFromActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> resumeExerciseAsync();
-    method public void setUpdateCallback(androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public void setUpdateCallback(java.util.concurrent.Executor executor, androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> startExerciseAsync(androidx.health.services.client.data.ExerciseConfig configuration);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> updateExerciseTypeConfigAsync(androidx.health.services.client.data.ExerciseTypeConfig exerciseTypeConfig);
-  }
-
-  public final class ExerciseClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? addGoalToActiveExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearUpdateCallback(androidx.health.services.client.ExerciseClient, androidx.health.services.client.ExerciseUpdateCallback callback, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? endExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? flush(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.ExerciseCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCurrentExerciseInfo(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.ExerciseInfo>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? markLap(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? overrideAutoPauseAndResumeForActiveExercise(androidx.health.services.client.ExerciseClient, boolean enabled, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? overrideBatchingModesForActiveExercise(androidx.health.services.client.ExerciseClient, java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModes, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? pauseExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? prepareExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.WarmUpConfig configuration, kotlin.coroutines.Continuation<? super kotlin.Unit>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? removeGoalFromActiveExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? resumeExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? startExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseConfig configuration, kotlin.coroutines.Continuation<? super kotlin.Unit>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? updateExerciseTypeConfig(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseTypeConfig exerciseTypeConfig, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  public interface ExerciseUpdateCallback {
-    method public void onAvailabilityChanged(androidx.health.services.client.data.DataType<?,?> dataType, androidx.health.services.client.data.Availability availability);
-    method public void onExerciseUpdateReceived(androidx.health.services.client.data.ExerciseUpdate update);
-    method public void onLapSummaryReceived(androidx.health.services.client.data.ExerciseLapSummary lapSummary);
-    method public void onRegistered();
-    method public void onRegistrationFailed(Throwable throwable);
-  }
-
-  public final class HealthServices {
-    method public static androidx.health.services.client.HealthServicesClient getClient(android.content.Context context);
-    field public static final androidx.health.services.client.HealthServices INSTANCE;
-  }
-
-  public interface HealthServicesClient {
-    method public androidx.health.services.client.ExerciseClient getExerciseClient();
-    method public androidx.health.services.client.MeasureClient getMeasureClient();
-    method public androidx.health.services.client.PassiveMonitoringClient getPassiveMonitoringClient();
-    property public abstract androidx.health.services.client.ExerciseClient exerciseClient;
-    property public abstract androidx.health.services.client.MeasureClient measureClient;
-    property public abstract androidx.health.services.client.PassiveMonitoringClient passiveMonitoringClient;
-  }
-
-  public final class HealthServicesException extends java.lang.Exception {
-    ctor public HealthServicesException(String message);
-  }
-
-  public final class ListenableFutureExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend <T> Object? awaitWithException(com.google.common.util.concurrent.ListenableFuture<T>, kotlin.coroutines.Continuation<? super T>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface MeasureCallback {
-    method public void onAvailabilityChanged(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.data.Availability availability);
-    method public void onDataReceived(androidx.health.services.client.data.DataPointContainer data);
-    method public default void onRegistered();
-    method public default void onRegistrationFailed(Throwable throwable);
-  }
-
-  public interface MeasureClient {
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> getCapabilitiesAsync();
-    method public void registerMeasureCallback(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback);
-    method public void registerMeasureCallback(androidx.health.services.client.data.DeltaDataType<?,?> dataType, java.util.concurrent.Executor executor, androidx.health.services.client.MeasureCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterMeasureCallbackAsync(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback);
-  }
-
-  public final class MeasureClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.MeasureClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.MeasureCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? unregisterMeasureCallback(androidx.health.services.client.MeasureClient, androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface PassiveListenerCallback {
-    method public default void onGoalCompleted(androidx.health.services.client.data.PassiveGoal goal);
-    method public default void onHealthEventReceived(androidx.health.services.client.data.HealthEvent event);
-    method public default void onNewDataPointsReceived(androidx.health.services.client.data.DataPointContainer dataPoints);
-    method public default void onPermissionLost();
-    method public default void onRegistered();
-    method public default void onRegistrationFailed(Throwable throwable);
-    method public default void onUserActivityInfoReceived(androidx.health.services.client.data.UserActivityInfo info);
-  }
-
-  public abstract class PassiveListenerService extends android.app.Service {
-    ctor public PassiveListenerService();
-    method public final android.os.IBinder? onBind(android.content.Intent intent);
-    method public void onGoalCompleted(androidx.health.services.client.data.PassiveGoal goal);
-    method public void onHealthEventReceived(androidx.health.services.client.data.HealthEvent event);
-    method public void onNewDataPointsReceived(androidx.health.services.client.data.DataPointContainer dataPoints);
-    method public void onPermissionLost();
-    method public void onUserActivityInfoReceived(androidx.health.services.client.data.UserActivityInfo info);
-  }
-
-  public interface PassiveMonitoringClient {
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearPassiveListenerCallbackAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearPassiveListenerServiceAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> getCapabilitiesAsync();
-    method public void setPassiveListenerCallback(androidx.health.services.client.data.PassiveListenerConfig config, androidx.health.services.client.PassiveListenerCallback callback);
-    method public void setPassiveListenerCallback(androidx.health.services.client.data.PassiveListenerConfig config, java.util.concurrent.Executor executor, androidx.health.services.client.PassiveListenerCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> setPassiveListenerServiceAsync(Class<? extends androidx.health.services.client.PassiveListenerService> service, androidx.health.services.client.data.PassiveListenerConfig config);
-  }
-
-  public final class PassiveMonitoringClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearPassiveListenerCallback(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearPassiveListenerService(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? flush(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.PassiveMonitoringCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? setPassiveListenerService(androidx.health.services.client.PassiveMonitoringClient, Class<? extends androidx.health.services.client.PassiveListenerService> service, androidx.health.services.client.data.PassiveListenerConfig config, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-}
-
-package androidx.health.services.client.data {
-
-  public final class AggregateDataType<T extends java.lang.Number, D extends androidx.health.services.client.data.DataPoint<T>> extends androidx.health.services.client.data.DataType<T,D> {
-    ctor public AggregateDataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass);
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface Availability {
-    method public int getId();
-    property public abstract int id;
-    field public static final androidx.health.services.client.data.Availability.Companion Companion;
-  }
-
-  public static final class Availability.Companion {
-  }
-
-  public final class BatchingMode {
-    field public static final androidx.health.services.client.data.BatchingMode.Companion Companion;
-    field public static final androidx.health.services.client.data.BatchingMode HEART_RATE_5_SECONDS;
-  }
-
-  public static final class BatchingMode.Companion {
-  }
-
-  public final class ComparisonType {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ComparisonType.Companion Companion;
-    field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN;
-    field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
-    field public static final androidx.health.services.client.data.ComparisonType LESS_THAN;
-    field public static final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
-    field public static final androidx.health.services.client.data.ComparisonType UNKNOWN;
-  }
-
-  public static final class ComparisonType.Companion {
-  }
-
-  public final class CumulativeDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public CumulativeDataPoint(androidx.health.services.client.data.AggregateDataType<T,androidx.health.services.client.data.CumulativeDataPoint<T>> dataType, T total, java.time.Instant start, java.time.Instant end);
-    method public java.time.Instant getEnd();
-    method public java.time.Instant getStart();
-    method public T getTotal();
-    property public final java.time.Instant end;
-    property public final java.time.Instant start;
-    property public final T total;
-  }
-
-  public abstract class DataPoint<T> {
-    method public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.DataPoint<T>> getDataType();
-    property public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.DataPoint<T>> dataType;
-  }
-
-  public abstract class DataPointAccuracy {
-    ctor public DataPointAccuracy();
-  }
-
-  public final class DataPointContainer {
-    ctor public DataPointContainer(java.util.List<? extends androidx.health.services.client.data.DataPoint<?>> dataPointList);
-    ctor public DataPointContainer(java.util.Map<androidx.health.services.client.data.DataType<?,?>,? extends java.util.List<? extends androidx.health.services.client.data.DataPoint<?>>> dataPoints);
-    method public java.util.List<androidx.health.services.client.data.CumulativeDataPoint<?>> getCumulativeDataPoints();
-    method public <T extends java.lang.Number, D extends androidx.health.services.client.data.DataPoint<T>> D? getData(androidx.health.services.client.data.AggregateDataType<T,D> type);
-    method public <T, D extends androidx.health.services.client.data.DataPoint<T>> java.util.List<D> getData(androidx.health.services.client.data.DeltaDataType<T,D> type);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getDataTypes();
-    method public java.util.List<androidx.health.services.client.data.IntervalDataPoint<?>> getIntervalDataPoints();
-    method public java.util.List<androidx.health.services.client.data.SampleDataPoint<?>> getSampleDataPoints();
-    method public java.util.List<androidx.health.services.client.data.StatisticalDataPoint<?>> getStatisticalDataPoints();
-    property public final java.util.List<androidx.health.services.client.data.CumulativeDataPoint<?>> cumulativeDataPoints;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> dataTypes;
-    property public final java.util.List<androidx.health.services.client.data.IntervalDataPoint<?>> intervalDataPoints;
-    property public final java.util.List<androidx.health.services.client.data.SampleDataPoint<?>> sampleDataPoints;
-    property public final java.util.List<androidx.health.services.client.data.StatisticalDataPoint<?>> statisticalDataPoints;
-  }
-
-  public abstract class DataType<T, D extends androidx.health.services.client.data.DataPoint<T>> {
-    ctor public DataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass, boolean isAggregate);
-    method public final String getName();
-    method public final Class<T> getValueClass();
-    property public final String name;
-    property public final Class<T> valueClass;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION_STATS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> ACTIVE_EXERCISE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> CALORIES_TOTAL;
-    field public static final androidx.health.services.client.data.DataType.Companion Companion;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DECLINE_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DECLINE_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> DECLINE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> DECLINE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_GAIN_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_LOSS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_LOSS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> FLAT_GROUND_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> FLAT_GROUND_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLOORS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> GOLF_SHOT_COUNT;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> GOLF_SHOT_COUNT_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> HEART_RATE_BPM;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> HEART_RATE_BPM_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> INCLINE_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> INCLINE_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> INCLINE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> INCLINE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<androidx.health.services.client.data.LocationData,androidx.health.services.client.data.SampleDataPoint<androidx.health.services.client.data.LocationData>> LOCATION;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> PACE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> PACE_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> REP_COUNT;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> REP_COUNT_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RUNNING_STEPS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RUNNING_STEPS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> SPEED;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> SPEED_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS_DAILY;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> STEPS_PER_MINUTE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> STEPS_PER_MINUTE_STATS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> STEPS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_STROKES;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_STROKES_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VO2_MAX;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VO2_MAX_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> WALKING_STEPS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> WALKING_STEPS_TOTAL;
-  }
-
-  public static final class DataType.Companion {
-  }
-
-  public static final class DataType.TimeType {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.DataType.TimeType.Companion Companion;
-    field public static final androidx.health.services.client.data.DataType.TimeType INTERVAL;
-    field public static final androidx.health.services.client.data.DataType.TimeType SAMPLE;
-    field public static final androidx.health.services.client.data.DataType.TimeType UNKNOWN;
-  }
-
-  public static final class DataType.TimeType.Companion {
-  }
-
-  public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
-    method public static androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
-    field public static final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
-    field public static final androidx.health.services.client.data.DataTypeAvailability.Companion Companion;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
-  }
-
-  public static final class DataTypeAvailability.Companion {
-    method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
-  }
-
-  public final class DataTypeCondition<T extends java.lang.Number, D extends androidx.health.services.client.data.DataType<T, ? extends androidx.health.services.client.data.DataPoint<T>>> {
-    ctor public DataTypeCondition(D dataType, T threshold, androidx.health.services.client.data.ComparisonType comparisonType);
-    method public androidx.health.services.client.data.ComparisonType getComparisonType();
-    method public D getDataType();
-    method public T getThreshold();
-    property public final androidx.health.services.client.data.ComparisonType comparisonType;
-    property public final D dataType;
-    property public final T threshold;
-  }
-
-  public final class DeltaDataType<T, D extends androidx.health.services.client.data.DataPoint<T>> extends androidx.health.services.client.data.DataType<T,D> {
-    ctor public DeltaDataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass);
-  }
-
-  public final class ExerciseCapabilities {
-    ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities);
-    ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities, optional java.util.Set<androidx.health.services.client.data.BatchingMode> supportedBatchingModeOverrides);
-    method public java.util.Set<androidx.health.services.client.data.ExerciseType> getAutoPauseAndResumeEnabledExercises();
-    method public androidx.health.services.client.data.ExerciseTypeCapabilities getExerciseTypeCapabilities(androidx.health.services.client.data.ExerciseType exercise);
-    method public java.util.Set<androidx.health.services.client.data.BatchingMode> getSupportedBatchingModeOverrides();
-    method public java.util.Set<androidx.health.services.client.data.ExerciseType> getSupportedExerciseTypes();
-    method public java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> getTypeToCapabilities();
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseType> autoPauseAndResumeEnabledExercises;
-    property public final java.util.Set<androidx.health.services.client.data.BatchingMode> supportedBatchingModeOverrides;
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseType> supportedExerciseTypes;
-    property public final java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities;
-  }
-
-  public final class ExerciseConfig {
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters);
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters, optional androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig);
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters, optional androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig, optional java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides);
-    method public static androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
-    method public java.util.Set<androidx.health.services.client.data.BatchingMode> getBatchingModeOverrides();
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getDataTypes();
-    method public java.util.List<androidx.health.services.client.data.ExerciseGoal<?>> getExerciseGoals();
-    method public android.os.Bundle getExerciseParams();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    method public androidx.health.services.client.data.ExerciseTypeConfig? getExerciseTypeConfig();
-    method public float getSwimmingPoolLengthMeters();
-    method public boolean isAutoPauseAndResumeEnabled();
-    method public boolean isGpsEnabled();
-    property public final java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> dataTypes;
-    property public final java.util.List<androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals;
-    property public final android.os.Bundle exerciseParams;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-    property public final androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig;
-    property public final boolean isAutoPauseAndResumeEnabled;
-    property public final boolean isGpsEnabled;
-    property public final float swimmingPoolLengthMeters;
-    field public static final androidx.health.services.client.data.ExerciseConfig.Companion Companion;
-    field public static final float SWIMMING_POOL_LENGTH_UNSPECIFIED = 0.0f;
-  }
-
-  public static final class ExerciseConfig.Builder {
-    ctor public ExerciseConfig.Builder(androidx.health.services.client.data.ExerciseType exerciseType);
-    method public androidx.health.services.client.data.ExerciseConfig build();
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setBatchingModeOverrides(java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setDataTypes(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseGoals(java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseParams(android.os.Bundle exerciseParams);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseTypeConfig(androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setIsAutoPauseAndResumeEnabled(boolean isAutoPauseAndResumeEnabled);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setIsGpsEnabled(boolean isGpsEnabled);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setSwimmingPoolLengthMeters(float swimmingPoolLength);
-  }
-
-  public static final class ExerciseConfig.Companion {
-    method public androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
-  }
-
-  public final class ExerciseGoal<T extends java.lang.Number> implements android.os.Parcelable {
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestone(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition, T period);
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal<T> goal, T newThreshold);
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition);
-    method public int describeContents();
-    method public androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> getDataTypeCondition();
-    method public androidx.health.services.client.data.ExerciseGoalType getExerciseGoalType();
-    method public T? getPeriod();
-    method public void writeToParcel(android.os.Parcel dest, int flags);
-    property public final androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> dataTypeCondition;
-    property public final androidx.health.services.client.data.ExerciseGoalType exerciseGoalType;
-    property public final T? period;
-    field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal<?>> CREATOR;
-    field public static final androidx.health.services.client.data.ExerciseGoal.Companion Companion;
-  }
-
-  public static final class ExerciseGoal.Companion {
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestone(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition, T period);
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal<T> goal, T newThreshold);
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition);
-  }
-
-  public final class ExerciseGoalType {
-    method public static androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseGoalType.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
-    field public static final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
-  }
-
-  public static final class ExerciseGoalType.Companion {
-    method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
-  }
-
-  public final class ExerciseInfo {
-    ctor public ExerciseInfo(int exerciseTrackedStatus, androidx.health.services.client.data.ExerciseType exerciseType);
-    method public int getExerciseTrackedStatus();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    property public final int exerciseTrackedStatus;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-  }
-
-  public final class ExerciseLapSummary {
-    ctor public ExerciseLapSummary(int lapCount, java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.DataPointContainer lapMetrics);
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getEndTime();
-    method public int getLapCount();
-    method public androidx.health.services.client.data.DataPointContainer getLapMetrics();
-    method public java.time.Instant getStartTime();
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant endTime;
-    property public final int lapCount;
-    property public final androidx.health.services.client.data.DataPointContainer lapMetrics;
-    property public final java.time.Instant startTime;
-  }
-
-  public final class ExerciseState {
-    method public static androidx.health.services.client.data.ExerciseState? fromId(int id);
-    method public int getId();
-    method public String getName();
-    method public boolean isEnded();
-    method public boolean isEnding();
-    method public boolean isPaused();
-    method public boolean isResuming();
-    property public final int id;
-    property public final boolean isEnded;
-    property public final boolean isEnding;
-    property public final boolean isPaused;
-    property public final boolean isResuming;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseState ACTIVE;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
-    field public static final androidx.health.services.client.data.ExerciseState.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseState ENDED;
-    field public static final androidx.health.services.client.data.ExerciseState ENDING;
-    field public static final androidx.health.services.client.data.ExerciseState PREPARING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_PAUSED;
-    field public static final androidx.health.services.client.data.ExerciseState USER_PAUSING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_RESUMING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_STARTING;
-  }
-
-  public static final class ExerciseState.Companion {
-    method public androidx.health.services.client.data.ExerciseState? fromId(int id);
-  }
-
-  public final class ExerciseStateInfo {
-    ctor public ExerciseStateInfo(androidx.health.services.client.data.ExerciseState exerciseState, int exerciseEndReason);
-    method public int getEndReason();
-    method public androidx.health.services.client.data.ExerciseState getState();
-    property public final int endReason;
-    property public final androidx.health.services.client.data.ExerciseState state;
-    field public static final androidx.health.services.client.data.ExerciseStateInfo.Companion Companion;
-  }
-
-  public static final class ExerciseStateInfo.Companion {
-  }
-
-  public final class ExerciseType {
-    method public static androidx.health.services.client.data.ExerciseType fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType BACKPACKING;
-    field public static final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
-    field public static final androidx.health.services.client.data.ExerciseType BADMINTON;
-    field public static final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
-    field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
-    field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
-    field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
-    field public static final androidx.health.services.client.data.ExerciseType BIKING;
-    field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
-    field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
-    field public static final androidx.health.services.client.data.ExerciseType BOXING;
-    field public static final androidx.health.services.client.data.ExerciseType BURPEE;
-    field public static final androidx.health.services.client.data.ExerciseType CALISTHENICS;
-    field public static final androidx.health.services.client.data.ExerciseType CRICKET;
-    field public static final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType CRUNCH;
-    field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseType DANCING;
-    field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
-    field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
-    field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
-    field public static final androidx.health.services.client.data.ExerciseType FENCING;
-    field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
-    field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
-    field public static final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
-    field public static final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
-    field public static final androidx.health.services.client.data.ExerciseType GOLF;
-    field public static final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
-    field public static final androidx.health.services.client.data.ExerciseType GYMNASTICS;
-    field public static final androidx.health.services.client.data.ExerciseType HANDBALL;
-    field public static final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
-    field public static final androidx.health.services.client.data.ExerciseType HIKING;
-    field public static final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
-    field public static final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
-    field public static final androidx.health.services.client.data.ExerciseType ICE_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
-    field public static final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
-    field public static final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
-    field public static final androidx.health.services.client.data.ExerciseType LUNGE;
-    field public static final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
-    field public static final androidx.health.services.client.data.ExerciseType MEDITATION;
-    field public static final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
-    field public static final androidx.health.services.client.data.ExerciseType ORIENTEERING;
-    field public static final androidx.health.services.client.data.ExerciseType PADDLING;
-    field public static final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
-    field public static final androidx.health.services.client.data.ExerciseType PILATES;
-    field public static final androidx.health.services.client.data.ExerciseType PLANK;
-    field public static final androidx.health.services.client.data.ExerciseType RACQUETBALL;
-    field public static final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
-    field public static final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
-    field public static final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType ROWING;
-    field public static final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
-    field public static final androidx.health.services.client.data.ExerciseType RUGBY;
-    field public static final androidx.health.services.client.data.ExerciseType RUNNING;
-    field public static final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
-    field public static final androidx.health.services.client.data.ExerciseType SAILING;
-    field public static final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
-    field public static final androidx.health.services.client.data.ExerciseType SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
-    field public static final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
-    field public static final androidx.health.services.client.data.ExerciseType SOCCER;
-    field public static final androidx.health.services.client.data.ExerciseType SOFTBALL;
-    field public static final androidx.health.services.client.data.ExerciseType SQUASH;
-    field public static final androidx.health.services.client.data.ExerciseType SQUAT;
-    field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
-    field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
-    field public static final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
-    field public static final androidx.health.services.client.data.ExerciseType STRETCHING;
-    field public static final androidx.health.services.client.data.ExerciseType SURFING;
-    field public static final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
-    field public static final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
-    field public static final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
-    field public static final androidx.health.services.client.data.ExerciseType TENNIS;
-    field public static final androidx.health.services.client.data.ExerciseType UNKNOWN;
-    field public static final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
-    field public static final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
-    field public static final androidx.health.services.client.data.ExerciseType WALKING;
-    field public static final androidx.health.services.client.data.ExerciseType WATER_POLO;
-    field public static final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
-    field public static final androidx.health.services.client.data.ExerciseType WORKOUT;
-    field public static final androidx.health.services.client.data.ExerciseType YACHTING;
-    field public static final androidx.health.services.client.data.ExerciseType YOGA;
-  }
-
-  public static final class ExerciseType.Companion {
-    method public androidx.health.services.client.data.ExerciseType fromId(int id);
-  }
-
-  public final class ExerciseTypeCapabilities {
-    ctor public ExerciseTypeCapabilities(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypes, java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals, java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones, boolean supportsAutoPauseAndResume);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypes();
-    method public java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedGoals();
-    method public java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedMilestones();
-    method public boolean getSupportsAutoPauseAndResume();
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypes;
-    property public final java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals;
-    property public final java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones;
-    property public final boolean supportsAutoPauseAndResume;
-  }
-
-  public abstract class ExerciseTypeConfig {
-    field public static final androidx.health.services.client.data.ExerciseTypeConfig.Companion Companion;
-  }
-
-  public static final class ExerciseTypeConfig.Companion {
-  }
-
-  public final class ExerciseUpdate {
-    method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.IntervalDataPoint<?> dataPoint);
-    method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.SampleDataPoint<?> dataPoint);
-    method public androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? getActiveDurationCheckpoint();
-    method public androidx.health.services.client.data.ExerciseConfig? getExerciseConfig();
-    method public androidx.health.services.client.data.ExerciseStateInfo getExerciseStateInfo();
-    method public java.util.Set<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number>> getLatestAchievedGoals();
-    method public androidx.health.services.client.data.DataPointContainer getLatestMetrics();
-    method public java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> getLatestMilestoneMarkerSummaries();
-    method public java.time.Instant? getStartTime();
-    method public java.time.Duration getUpdateDurationFromBoot();
-    property public final androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint;
-    property public final androidx.health.services.client.data.ExerciseConfig? exerciseConfig;
-    property public final androidx.health.services.client.data.ExerciseStateInfo exerciseStateInfo;
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number>> latestAchievedGoals;
-    property public final androidx.health.services.client.data.DataPointContainer latestMetrics;
-    property public final java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries;
-    property public final java.time.Instant? startTime;
-    field public static final androidx.health.services.client.data.ExerciseUpdate.Companion Companion;
-  }
-
-  public static final class ExerciseUpdate.ActiveDurationCheckpoint {
-    ctor public ExerciseUpdate.ActiveDurationCheckpoint(java.time.Instant time, java.time.Duration activeDuration);
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getTime();
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant time;
-  }
-
-  public static final class ExerciseUpdate.Companion {
-  }
-
-  public final class GolfExerciseTypeConfig extends androidx.health.services.client.data.ExerciseTypeConfig {
-    ctor public GolfExerciseTypeConfig(optional androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo golfShotTrackingPlaceInfo);
-    method public androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo getGolfShotTrackingPlaceInfo();
-    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo golfShotTrackingPlaceInfo;
-  }
-
-  public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo {
-    method public int getPlaceInfoId();
-    property public final int placeInfoId;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion Companion;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_FAIRWAY;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_PUTTING_GREEN;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_TEE_BOX;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_UNSPECIFIED;
-  }
-
-  public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion {
-  }
-
-  public final class HealthEvent {
-    ctor public HealthEvent(androidx.health.services.client.data.HealthEvent.Type type, java.time.Instant eventTime, androidx.health.services.client.data.DataPointContainer metrics);
-    method public java.time.Instant getEventTime();
-    method public androidx.health.services.client.data.DataPointContainer getMetrics();
-    method public androidx.health.services.client.data.HealthEvent.Type getType();
-    property public final java.time.Instant eventTime;
-    property public final androidx.health.services.client.data.DataPointContainer metrics;
-    property public final androidx.health.services.client.data.HealthEvent.Type type;
-  }
-
-  public static final class HealthEvent.Type {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.HealthEvent.Type.Companion Companion;
-    field public static final androidx.health.services.client.data.HealthEvent.Type FALL_DETECTED;
-    field public static final androidx.health.services.client.data.HealthEvent.Type UNKNOWN;
-  }
-
-  public static final class HealthEvent.Type.Companion {
-  }
-
-  public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
-    ctor public HeartRateAccuracy(androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus);
-    method public androidx.health.services.client.data.HeartRateAccuracy.SensorStatus getSensorStatus();
-    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus;
-  }
-
-  public static final class HeartRateAccuracy.SensorStatus {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus.Companion Companion;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
-  }
-
-  public static final class HeartRateAccuracy.SensorStatus.Companion {
-  }
-
-  public final class IntervalDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public IntervalDataPoint(androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> dataType, T value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
-    method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
-    method public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> getDataType();
-    method public java.time.Duration getEndDurationFromBoot();
-    method public java.time.Instant getEndInstant(java.time.Instant bootInstant);
-    method public android.os.Bundle getMetadata();
-    method public java.time.Duration getStartDurationFromBoot();
-    method public java.time.Instant getStartInstant(java.time.Instant bootInstant);
-    method public T getValue();
-    property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
-    property public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> dataType;
-    property public final java.time.Duration endDurationFromBoot;
-    property public final android.os.Bundle metadata;
-    property public final java.time.Duration startDurationFromBoot;
-    property public final T value;
-  }
-
-  public final class LocationAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
-    ctor public LocationAccuracy(@FloatRange(from=0.0) double horizontalPositionErrorMeters, optional @FloatRange(from=0.0) double verticalPositionErrorMeters);
-    method public double getHorizontalPositionErrorMeters();
-    method public double getVerticalPositionErrorMeters();
-    property public final double horizontalPositionErrorMeters;
-    property public final double verticalPositionErrorMeters;
-    field public static final androidx.health.services.client.data.LocationAccuracy.Companion Companion;
-  }
-
-  public static final class LocationAccuracy.Companion {
-  }
-
-  public final class LocationAvailability implements androidx.health.services.client.data.Availability {
-    method public static androidx.health.services.client.data.LocationAvailability? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRING;
-    field public static final androidx.health.services.client.data.LocationAvailability.Companion Companion;
-    field public static final androidx.health.services.client.data.LocationAvailability NO_GNSS;
-    field public static final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
-    field public static final androidx.health.services.client.data.LocationAvailability UNKNOWN;
-  }
-
-  public static final class LocationAvailability.Companion {
-    method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
-  }
-
-  public final class LocationData {
-    ctor public LocationData(@FloatRange(from=-90.0, to=90.0) double latitude, @FloatRange(from=-180.0, to=180.0) double longitude, optional double altitude, optional double bearing);
-    method public double getAltitude();
-    method public double getBearing();
-    method public double getLatitude();
-    method public double getLongitude();
-    property public final double altitude;
-    property public final double bearing;
-    property public final double latitude;
-    property public final double longitude;
-    field public static final double ALTITUDE_UNAVAILABLE = (0.0/0.0);
-    field public static final double BEARING_UNAVAILABLE = (0.0/0.0);
-  }
-
-  public final class MeasureCapabilities {
-    ctor public MeasureCapabilities(java.util.Set<? extends androidx.health.services.client.data.DeltaDataType<?,?>> supportedDataTypesMeasure);
-    method public java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> getSupportedDataTypesMeasure();
-    property public final java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> supportedDataTypesMeasure;
-  }
-
-  public final class MilestoneMarkerSummary {
-    ctor public MilestoneMarkerSummary(java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> achievedGoal, androidx.health.services.client.data.DataPointContainer summaryMetrics);
-    method public androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> getAchievedGoal();
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getEndTime();
-    method public java.time.Instant getStartTime();
-    method public androidx.health.services.client.data.DataPointContainer getSummaryMetrics();
-    property public final androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> achievedGoal;
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant endTime;
-    property public final java.time.Instant startTime;
-    property public final androidx.health.services.client.data.DataPointContainer summaryMetrics;
-  }
-
-  public final class PassiveGoal {
-    ctor public PassiveGoal(androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> dataTypeCondition);
-    method public androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> getDataTypeCondition();
-    property public final androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> dataTypeCondition;
-  }
-
-  public final class PassiveListenerConfig {
-    ctor public PassiveListenerConfig(java.util.Set<? extends androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> dataTypes, boolean shouldUserActivityInfoBeRequested, java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals, java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes);
-    method public static androidx.health.services.client.data.PassiveListenerConfig.Builder builder();
-    method public java.util.Set<androidx.health.services.client.data.PassiveGoal> getDailyGoals();
-    method public java.util.Set<androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> getDataTypes();
-    method public java.util.Set<androidx.health.services.client.data.HealthEvent.Type> getHealthEventTypes();
-    method public boolean getShouldUserActivityInfoBeRequested();
-    property public final java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> dataTypes;
-    property public final java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes;
-    property public final boolean shouldUserActivityInfoBeRequested;
-    field public static final androidx.health.services.client.data.PassiveListenerConfig.Companion Companion;
-  }
-
-  public static final class PassiveListenerConfig.Builder {
-    ctor public PassiveListenerConfig.Builder();
-    method public androidx.health.services.client.data.PassiveListenerConfig build();
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setDailyGoals(java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setDataTypes(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setHealthEventTypes(java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setShouldUserActivityInfoBeRequested(boolean shouldUserActivityInfoBeRequested);
-  }
-
-  public static final class PassiveListenerConfig.Companion {
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder builder();
-  }
-
-  public final class PassiveMonitoringCapabilities {
-    ctor public PassiveMonitoringCapabilities(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveMonitoring, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveGoals, java.util.Set<androidx.health.services.client.data.HealthEvent.Type> supportedHealthEventTypes, java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypesPassiveGoals();
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypesPassiveMonitoring();
-    method public java.util.Set<androidx.health.services.client.data.HealthEvent.Type> getSupportedHealthEventTypes();
-    method public java.util.Set<androidx.health.services.client.data.UserActivityState> getSupportedUserActivityStates();
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveGoals;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveMonitoring;
-    property public final java.util.Set<androidx.health.services.client.data.HealthEvent.Type> supportedHealthEventTypes;
-    property public final java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates;
-  }
-
-  public final class PassiveMonitoringUpdate {
-    ctor public PassiveMonitoringUpdate(androidx.health.services.client.data.DataPointContainer dataPoints, java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates);
-    method public androidx.health.services.client.data.DataPointContainer getDataPoints();
-    method public java.util.List<androidx.health.services.client.data.UserActivityInfo> getUserActivityInfoUpdates();
-    property public final androidx.health.services.client.data.DataPointContainer dataPoints;
-    property public final java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates;
-  }
-
-  public final class SampleDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public SampleDataPoint(androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> dataType, T value, java.time.Duration timeDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
-    method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
-    method public androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> getDataType();
-    method public android.os.Bundle getMetadata();
-    method public java.time.Duration getTimeDurationFromBoot();
-    method public java.time.Instant getTimeInstant(java.time.Instant bootInstant);
-    method public T getValue();
-    property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
-    property public androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> dataType;
-    property public final android.os.Bundle metadata;
-    property public final java.time.Duration timeDurationFromBoot;
-    property public final T value;
-  }
-
-  public final class StatisticalDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public StatisticalDataPoint(androidx.health.services.client.data.AggregateDataType<T,androidx.health.services.client.data.StatisticalDataPoint<T>> dataType, T min, T max, T average, java.time.Instant start, java.time.Instant end);
-    method public T getAverage();
-    method public java.time.Instant getEnd();
-    method public T getMax();
-    method public T getMin();
-    method public java.time.Instant getStart();
-    property public final T average;
-    property public final java.time.Instant end;
-    property public final T max;
-    property public final T min;
-    property public final java.time.Instant start;
-    field public static final androidx.health.services.client.data.StatisticalDataPoint.Companion Companion;
-  }
-
-  public static final class StatisticalDataPoint.Companion {
-  }
-
-  public final class UserActivityInfo {
-    ctor public UserActivityInfo(androidx.health.services.client.data.UserActivityState userActivityState, androidx.health.services.client.data.ExerciseInfo? exerciseInfo, java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.ExerciseInfo? getExerciseInfo();
-    method public java.time.Instant getStateChangeTime();
-    method public androidx.health.services.client.data.UserActivityState getUserActivityState();
-    property public final androidx.health.services.client.data.ExerciseInfo? exerciseInfo;
-    property public final java.time.Instant stateChangeTime;
-    property public final androidx.health.services.client.data.UserActivityState userActivityState;
-    field public static final androidx.health.services.client.data.UserActivityInfo.Companion Companion;
-  }
-
-  public static final class UserActivityInfo.Companion {
-    method public androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
-  }
-
-  public final class UserActivityState {
-    ctor public UserActivityState(int id, String name);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.UserActivityState.Companion Companion;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
-  }
-
-  public static final class UserActivityState.Companion {
-  }
-
-  public final class WarmUpConfig {
-    ctor public WarmUpConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DeltaDataType<?,?>> dataTypes);
-    method public java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> getDataTypes();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    property public final java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> dataTypes;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-  }
-
-}
-
diff --git a/health/health-services-client/api/public_plus_experimental_current.txt b/health/health-services-client/api/public_plus_experimental_current.txt
deleted file mode 100644
index 92e1fab..0000000
--- a/health/health-services-client/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,910 +0,0 @@
-// Signature format: 4.0
-package androidx.health.services.client {
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface ExerciseClient {
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> addGoalToActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearUpdateCallbackAsync(androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> endExerciseAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseCapabilities> getCapabilitiesAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.ExerciseInfo> getCurrentExerciseInfoAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> markLapAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideAutoPauseAndResumeForActiveExerciseAsync(boolean enabled);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> overrideBatchingModesForActiveExerciseAsync(java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModes);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> pauseExerciseAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> prepareExerciseAsync(androidx.health.services.client.data.WarmUpConfig configuration);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> removeGoalFromActiveExerciseAsync(androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> resumeExerciseAsync();
-    method public void setUpdateCallback(androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public void setUpdateCallback(java.util.concurrent.Executor executor, androidx.health.services.client.ExerciseUpdateCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> startExerciseAsync(androidx.health.services.client.data.ExerciseConfig configuration);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> updateExerciseTypeConfigAsync(androidx.health.services.client.data.ExerciseTypeConfig exerciseTypeConfig);
-  }
-
-  public final class ExerciseClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? addGoalToActiveExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearUpdateCallback(androidx.health.services.client.ExerciseClient, androidx.health.services.client.ExerciseUpdateCallback callback, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? endExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? flush(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.ExerciseCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCurrentExerciseInfo(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.ExerciseInfo>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? markLap(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? overrideAutoPauseAndResumeForActiveExercise(androidx.health.services.client.ExerciseClient, boolean enabled, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? overrideBatchingModesForActiveExercise(androidx.health.services.client.ExerciseClient, java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModes, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? pauseExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? prepareExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.WarmUpConfig configuration, kotlin.coroutines.Continuation<? super kotlin.Unit>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? removeGoalFromActiveExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseGoal<?> exerciseGoal, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? resumeExercise(androidx.health.services.client.ExerciseClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? startExercise(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseConfig configuration, kotlin.coroutines.Continuation<? super kotlin.Unit>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? updateExerciseTypeConfig(androidx.health.services.client.ExerciseClient, androidx.health.services.client.data.ExerciseTypeConfig exerciseTypeConfig, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  public interface ExerciseUpdateCallback {
-    method public void onAvailabilityChanged(androidx.health.services.client.data.DataType<?,?> dataType, androidx.health.services.client.data.Availability availability);
-    method public void onExerciseUpdateReceived(androidx.health.services.client.data.ExerciseUpdate update);
-    method public void onLapSummaryReceived(androidx.health.services.client.data.ExerciseLapSummary lapSummary);
-    method public void onRegistered();
-    method public void onRegistrationFailed(Throwable throwable);
-  }
-
-  public final class HealthServices {
-    method public static androidx.health.services.client.HealthServicesClient getClient(android.content.Context context);
-    field public static final androidx.health.services.client.HealthServices INSTANCE;
-  }
-
-  public interface HealthServicesClient {
-    method public androidx.health.services.client.ExerciseClient getExerciseClient();
-    method public androidx.health.services.client.MeasureClient getMeasureClient();
-    method public androidx.health.services.client.PassiveMonitoringClient getPassiveMonitoringClient();
-    property public abstract androidx.health.services.client.ExerciseClient exerciseClient;
-    property public abstract androidx.health.services.client.MeasureClient measureClient;
-    property public abstract androidx.health.services.client.PassiveMonitoringClient passiveMonitoringClient;
-  }
-
-  public final class HealthServicesException extends java.lang.Exception {
-    ctor public HealthServicesException(String message);
-  }
-
-  public final class ListenableFutureExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend <T> Object? awaitWithException(com.google.common.util.concurrent.ListenableFuture<T>, kotlin.coroutines.Continuation<? super T>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface MeasureCallback {
-    method public void onAvailabilityChanged(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.data.Availability availability);
-    method public void onDataReceived(androidx.health.services.client.data.DataPointContainer data);
-    method public default void onRegistered();
-    method public default void onRegistrationFailed(Throwable throwable);
-  }
-
-  public interface MeasureClient {
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.MeasureCapabilities> getCapabilitiesAsync();
-    method public void registerMeasureCallback(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback);
-    method public void registerMeasureCallback(androidx.health.services.client.data.DeltaDataType<?,?> dataType, java.util.concurrent.Executor executor, androidx.health.services.client.MeasureCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> unregisterMeasureCallbackAsync(androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback);
-  }
-
-  public final class MeasureClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.MeasureClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.MeasureCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? unregisterMeasureCallback(androidx.health.services.client.MeasureClient, androidx.health.services.client.data.DeltaDataType<?,?> dataType, androidx.health.services.client.MeasureCallback callback, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface PassiveListenerCallback {
-    method public default void onGoalCompleted(androidx.health.services.client.data.PassiveGoal goal);
-    method public default void onHealthEventReceived(androidx.health.services.client.data.HealthEvent event);
-    method public default void onNewDataPointsReceived(androidx.health.services.client.data.DataPointContainer dataPoints);
-    method public default void onPermissionLost();
-    method public default void onRegistered();
-    method public default void onRegistrationFailed(Throwable throwable);
-    method public default void onUserActivityInfoReceived(androidx.health.services.client.data.UserActivityInfo info);
-  }
-
-  public abstract class PassiveListenerService extends android.app.Service {
-    ctor public PassiveListenerService();
-    method public final android.os.IBinder? onBind(android.content.Intent intent);
-    method public void onGoalCompleted(androidx.health.services.client.data.PassiveGoal goal);
-    method public void onHealthEventReceived(androidx.health.services.client.data.HealthEvent event);
-    method public void onNewDataPointsReceived(androidx.health.services.client.data.DataPointContainer dataPoints);
-    method public void onPermissionLost();
-    method public void onUserActivityInfoReceived(androidx.health.services.client.data.UserActivityInfo info);
-  }
-
-  public interface PassiveMonitoringClient {
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearPassiveListenerCallbackAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> clearPassiveListenerServiceAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> flushAsync();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.health.services.client.data.PassiveMonitoringCapabilities> getCapabilitiesAsync();
-    method public void setPassiveListenerCallback(androidx.health.services.client.data.PassiveListenerConfig config, androidx.health.services.client.PassiveListenerCallback callback);
-    method public void setPassiveListenerCallback(androidx.health.services.client.data.PassiveListenerConfig config, java.util.concurrent.Executor executor, androidx.health.services.client.PassiveListenerCallback callback);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.Void> setPassiveListenerServiceAsync(Class<? extends androidx.health.services.client.PassiveListenerService> service, androidx.health.services.client.data.PassiveListenerConfig config);
-  }
-
-  public final class PassiveMonitoringClientExtensionKt {
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearPassiveListenerCallback(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? clearPassiveListenerService(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? flush(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? getCapabilities(androidx.health.services.client.PassiveMonitoringClient, kotlin.coroutines.Continuation<? super androidx.health.services.client.data.PassiveMonitoringCapabilities>) throws androidx.health.services.client.HealthServicesException;
-    method @kotlin.jvm.Throws(exceptionClasses=HealthServicesException::class) public static suspend Object? setPassiveListenerService(androidx.health.services.client.PassiveMonitoringClient, Class<? extends androidx.health.services.client.PassiveListenerService> service, androidx.health.services.client.data.PassiveListenerConfig config, kotlin.coroutines.Continuation<? super java.lang.Void>) throws androidx.health.services.client.HealthServicesException;
-  }
-
-}
-
-package androidx.health.services.client.data {
-
-  public final class AggregateDataType<T extends java.lang.Number, D extends androidx.health.services.client.data.DataPoint<T>> extends androidx.health.services.client.data.DataType<T,D> {
-    ctor public AggregateDataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass);
-  }
-
-  @kotlin.jvm.JvmDefaultWithCompatibility public interface Availability {
-    method public int getId();
-    property public abstract int id;
-    field public static final androidx.health.services.client.data.Availability.Companion Companion;
-  }
-
-  public static final class Availability.Companion {
-  }
-
-  public final class BatchingMode {
-    field public static final androidx.health.services.client.data.BatchingMode.Companion Companion;
-    field public static final androidx.health.services.client.data.BatchingMode HEART_RATE_5_SECONDS;
-  }
-
-  public static final class BatchingMode.Companion {
-  }
-
-  public final class ComparisonType {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ComparisonType.Companion Companion;
-    field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN;
-    field public static final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
-    field public static final androidx.health.services.client.data.ComparisonType LESS_THAN;
-    field public static final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
-    field public static final androidx.health.services.client.data.ComparisonType UNKNOWN;
-  }
-
-  public static final class ComparisonType.Companion {
-  }
-
-  public final class CumulativeDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public CumulativeDataPoint(androidx.health.services.client.data.AggregateDataType<T,androidx.health.services.client.data.CumulativeDataPoint<T>> dataType, T total, java.time.Instant start, java.time.Instant end);
-    method public java.time.Instant getEnd();
-    method public java.time.Instant getStart();
-    method public T getTotal();
-    property public final java.time.Instant end;
-    property public final java.time.Instant start;
-    property public final T total;
-  }
-
-  public abstract class DataPoint<T> {
-    method public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.DataPoint<T>> getDataType();
-    property public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.DataPoint<T>> dataType;
-  }
-
-  public abstract class DataPointAccuracy {
-    ctor public DataPointAccuracy();
-  }
-
-  public final class DataPointContainer {
-    ctor public DataPointContainer(java.util.List<? extends androidx.health.services.client.data.DataPoint<?>> dataPointList);
-    ctor public DataPointContainer(java.util.Map<androidx.health.services.client.data.DataType<?,?>,? extends java.util.List<? extends androidx.health.services.client.data.DataPoint<?>>> dataPoints);
-    method public java.util.List<androidx.health.services.client.data.CumulativeDataPoint<?>> getCumulativeDataPoints();
-    method public <T extends java.lang.Number, D extends androidx.health.services.client.data.DataPoint<T>> D? getData(androidx.health.services.client.data.AggregateDataType<T,D> type);
-    method public <T, D extends androidx.health.services.client.data.DataPoint<T>> java.util.List<D> getData(androidx.health.services.client.data.DeltaDataType<T,D> type);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getDataTypes();
-    method public java.util.List<androidx.health.services.client.data.IntervalDataPoint<?>> getIntervalDataPoints();
-    method public java.util.List<androidx.health.services.client.data.SampleDataPoint<?>> getSampleDataPoints();
-    method public java.util.List<androidx.health.services.client.data.StatisticalDataPoint<?>> getStatisticalDataPoints();
-    property public final java.util.List<androidx.health.services.client.data.CumulativeDataPoint<?>> cumulativeDataPoints;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> dataTypes;
-    property public final java.util.List<androidx.health.services.client.data.IntervalDataPoint<?>> intervalDataPoints;
-    property public final java.util.List<androidx.health.services.client.data.SampleDataPoint<?>> sampleDataPoints;
-    property public final java.util.List<androidx.health.services.client.data.StatisticalDataPoint<?>> statisticalDataPoints;
-  }
-
-  public abstract class DataType<T, D extends androidx.health.services.client.data.DataPoint<T>> {
-    ctor public DataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass, boolean isAggregate);
-    method public final String getName();
-    method public final Class<T> getValueClass();
-    property public final String name;
-    property public final Class<T> valueClass;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION_STATS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> ACTIVE_EXERCISE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> CALORIES_TOTAL;
-    field public static final androidx.health.services.client.data.DataType.Companion Companion;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DECLINE_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DECLINE_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> DECLINE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> DECLINE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_GAIN_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_LOSS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_LOSS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> FLAT_GROUND_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> FLAT_GROUND_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS_DAILY;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLOORS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> GOLF_SHOT_COUNT;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> GOLF_SHOT_COUNT_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> HEART_RATE_BPM;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> HEART_RATE_BPM_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> INCLINE_DISTANCE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> INCLINE_DISTANCE_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> INCLINE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> INCLINE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<androidx.health.services.client.data.LocationData,androidx.health.services.client.data.SampleDataPoint<androidx.health.services.client.data.LocationData>> LOCATION;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> PACE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> PACE_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> REP_COUNT;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> REP_COUNT_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RUNNING_STEPS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RUNNING_STEPS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> SPEED;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> SPEED_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS_DAILY;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> STEPS_PER_MINUTE;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> STEPS_PER_MINUTE_STATS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> STEPS_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_STROKES;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_STROKES_TOTAL;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VO2_MAX;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VO2_MAX_STATS;
-    field public static final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> WALKING_STEPS;
-    field public static final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> WALKING_STEPS_TOTAL;
-  }
-
-  public static final class DataType.Companion {
-  }
-
-  public static final class DataType.TimeType {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.DataType.TimeType.Companion Companion;
-    field public static final androidx.health.services.client.data.DataType.TimeType INTERVAL;
-    field public static final androidx.health.services.client.data.DataType.TimeType SAMPLE;
-    field public static final androidx.health.services.client.data.DataType.TimeType UNKNOWN;
-  }
-
-  public static final class DataType.TimeType.Companion {
-  }
-
-  public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
-    method public static androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
-    field public static final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
-    field public static final androidx.health.services.client.data.DataTypeAvailability.Companion Companion;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
-    field public static final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
-  }
-
-  public static final class DataTypeAvailability.Companion {
-    method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
-  }
-
-  public final class DataTypeCondition<T extends java.lang.Number, D extends androidx.health.services.client.data.DataType<T, ? extends androidx.health.services.client.data.DataPoint<T>>> {
-    ctor public DataTypeCondition(D dataType, T threshold, androidx.health.services.client.data.ComparisonType comparisonType);
-    method public androidx.health.services.client.data.ComparisonType getComparisonType();
-    method public D getDataType();
-    method public T getThreshold();
-    property public final androidx.health.services.client.data.ComparisonType comparisonType;
-    property public final D dataType;
-    property public final T threshold;
-  }
-
-  public final class DeltaDataType<T, D extends androidx.health.services.client.data.DataPoint<T>> extends androidx.health.services.client.data.DataType<T,D> {
-    ctor public DeltaDataType(String name, androidx.health.services.client.data.DataType.TimeType timeType, Class<T> valueClass);
-  }
-
-  public final class ExerciseCapabilities {
-    ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities);
-    ctor public ExerciseCapabilities(java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities, optional java.util.Set<androidx.health.services.client.data.BatchingMode> supportedBatchingModeOverrides);
-    method public java.util.Set<androidx.health.services.client.data.ExerciseType> getAutoPauseAndResumeEnabledExercises();
-    method public androidx.health.services.client.data.ExerciseTypeCapabilities getExerciseTypeCapabilities(androidx.health.services.client.data.ExerciseType exercise);
-    method public java.util.Set<androidx.health.services.client.data.BatchingMode> getSupportedBatchingModeOverrides();
-    method public java.util.Set<androidx.health.services.client.data.ExerciseType> getSupportedExerciseTypes();
-    method public java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> getTypeToCapabilities();
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseType> autoPauseAndResumeEnabledExercises;
-    property public final java.util.Set<androidx.health.services.client.data.BatchingMode> supportedBatchingModeOverrides;
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseType> supportedExerciseTypes;
-    property public final java.util.Map<androidx.health.services.client.data.ExerciseType,androidx.health.services.client.data.ExerciseTypeCapabilities> typeToCapabilities;
-  }
-
-  public final class ExerciseConfig {
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters);
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters, optional androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig);
-    ctor public ExerciseConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes, boolean isAutoPauseAndResumeEnabled, boolean isGpsEnabled, optional java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals, optional android.os.Bundle exerciseParams, optional @FloatRange(from=0.0) float swimmingPoolLengthMeters, optional androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig, optional java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides);
-    method public static androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
-    method public java.util.Set<androidx.health.services.client.data.BatchingMode> getBatchingModeOverrides();
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getDataTypes();
-    method public java.util.List<androidx.health.services.client.data.ExerciseGoal<?>> getExerciseGoals();
-    method public android.os.Bundle getExerciseParams();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    method public androidx.health.services.client.data.ExerciseTypeConfig? getExerciseTypeConfig();
-    method public float getSwimmingPoolLengthMeters();
-    method public boolean isAutoPauseAndResumeEnabled();
-    method public boolean isGpsEnabled();
-    property public final java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> dataTypes;
-    property public final java.util.List<androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals;
-    property public final android.os.Bundle exerciseParams;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-    property public final androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig;
-    property public final boolean isAutoPauseAndResumeEnabled;
-    property public final boolean isGpsEnabled;
-    property public final float swimmingPoolLengthMeters;
-    field public static final androidx.health.services.client.data.ExerciseConfig.Companion Companion;
-    field public static final float SWIMMING_POOL_LENGTH_UNSPECIFIED = 0.0f;
-  }
-
-  public static final class ExerciseConfig.Builder {
-    ctor public ExerciseConfig.Builder(androidx.health.services.client.data.ExerciseType exerciseType);
-    method public androidx.health.services.client.data.ExerciseConfig build();
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setBatchingModeOverrides(java.util.Set<androidx.health.services.client.data.BatchingMode> batchingModeOverrides);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setDataTypes(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseGoals(java.util.List<? extends androidx.health.services.client.data.ExerciseGoal<?>> exerciseGoals);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseParams(android.os.Bundle exerciseParams);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setExerciseTypeConfig(androidx.health.services.client.data.ExerciseTypeConfig? exerciseTypeConfig);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setIsAutoPauseAndResumeEnabled(boolean isAutoPauseAndResumeEnabled);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setIsGpsEnabled(boolean isGpsEnabled);
-    method public androidx.health.services.client.data.ExerciseConfig.Builder setSwimmingPoolLengthMeters(float swimmingPoolLength);
-  }
-
-  public static final class ExerciseConfig.Companion {
-    method public androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
-  }
-
-  public final class ExerciseGoal<T extends java.lang.Number> implements android.os.Parcelable {
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestone(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition, T period);
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal<T> goal, T newThreshold);
-    method public static <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition);
-    method public int describeContents();
-    method public androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> getDataTypeCondition();
-    method public androidx.health.services.client.data.ExerciseGoalType getExerciseGoalType();
-    method public T? getPeriod();
-    method public void writeToParcel(android.os.Parcel dest, int flags);
-    property public final androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> dataTypeCondition;
-    property public final androidx.health.services.client.data.ExerciseGoalType exerciseGoalType;
-    property public final T? period;
-    field public static final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal<?>> CREATOR;
-    field public static final androidx.health.services.client.data.ExerciseGoal.Companion Companion;
-  }
-
-  public static final class ExerciseGoal.Companion {
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestone(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition, T period);
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createMilestoneGoalWithUpdatedThreshold(androidx.health.services.client.data.ExerciseGoal<T> goal, T newThreshold);
-    method public <T extends java.lang.Number> androidx.health.services.client.data.ExerciseGoal<T> createOneTimeGoal(androidx.health.services.client.data.DataTypeCondition<T,androidx.health.services.client.data.AggregateDataType<T,?>> condition);
-  }
-
-  public final class ExerciseGoalType {
-    method public static androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseGoalType.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
-    field public static final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
-  }
-
-  public static final class ExerciseGoalType.Companion {
-    method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
-  }
-
-  public final class ExerciseInfo {
-    ctor public ExerciseInfo(int exerciseTrackedStatus, androidx.health.services.client.data.ExerciseType exerciseType);
-    method public int getExerciseTrackedStatus();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    property public final int exerciseTrackedStatus;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-  }
-
-  public final class ExerciseLapSummary {
-    ctor public ExerciseLapSummary(int lapCount, java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.DataPointContainer lapMetrics);
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getEndTime();
-    method public int getLapCount();
-    method public androidx.health.services.client.data.DataPointContainer getLapMetrics();
-    method public java.time.Instant getStartTime();
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant endTime;
-    property public final int lapCount;
-    property public final androidx.health.services.client.data.DataPointContainer lapMetrics;
-    property public final java.time.Instant startTime;
-  }
-
-  public final class ExerciseState {
-    method public static androidx.health.services.client.data.ExerciseState? fromId(int id);
-    method public int getId();
-    method public String getName();
-    method public boolean isEnded();
-    method public boolean isEnding();
-    method public boolean isPaused();
-    method public boolean isResuming();
-    property public final int id;
-    property public final boolean isEnded;
-    property public final boolean isEnding;
-    property public final boolean isPaused;
-    property public final boolean isResuming;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseState ACTIVE;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
-    field public static final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
-    field public static final androidx.health.services.client.data.ExerciseState.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseState ENDED;
-    field public static final androidx.health.services.client.data.ExerciseState ENDING;
-    field public static final androidx.health.services.client.data.ExerciseState PREPARING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_PAUSED;
-    field public static final androidx.health.services.client.data.ExerciseState USER_PAUSING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_RESUMING;
-    field public static final androidx.health.services.client.data.ExerciseState USER_STARTING;
-  }
-
-  public static final class ExerciseState.Companion {
-    method public androidx.health.services.client.data.ExerciseState? fromId(int id);
-  }
-
-  public final class ExerciseStateInfo {
-    ctor public ExerciseStateInfo(androidx.health.services.client.data.ExerciseState exerciseState, int exerciseEndReason);
-    method public int getEndReason();
-    method public androidx.health.services.client.data.ExerciseState getState();
-    property public final int endReason;
-    property public final androidx.health.services.client.data.ExerciseState state;
-    field public static final androidx.health.services.client.data.ExerciseStateInfo.Companion Companion;
-  }
-
-  public static final class ExerciseStateInfo.Companion {
-  }
-
-  public final class ExerciseType {
-    method public static androidx.health.services.client.data.ExerciseType fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType BACKPACKING;
-    field public static final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
-    field public static final androidx.health.services.client.data.ExerciseType BADMINTON;
-    field public static final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
-    field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
-    field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
-    field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
-    field public static final androidx.health.services.client.data.ExerciseType BIKING;
-    field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
-    field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
-    field public static final androidx.health.services.client.data.ExerciseType BOXING;
-    field public static final androidx.health.services.client.data.ExerciseType BURPEE;
-    field public static final androidx.health.services.client.data.ExerciseType CALISTHENICS;
-    field public static final androidx.health.services.client.data.ExerciseType CRICKET;
-    field public static final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType CRUNCH;
-    field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
-    field public static final androidx.health.services.client.data.ExerciseType DANCING;
-    field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
-    field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
-    field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
-    field public static final androidx.health.services.client.data.ExerciseType FENCING;
-    field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
-    field public static final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
-    field public static final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
-    field public static final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
-    field public static final androidx.health.services.client.data.ExerciseType GOLF;
-    field public static final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
-    field public static final androidx.health.services.client.data.ExerciseType GYMNASTICS;
-    field public static final androidx.health.services.client.data.ExerciseType HANDBALL;
-    field public static final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
-    field public static final androidx.health.services.client.data.ExerciseType HIKING;
-    field public static final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
-    field public static final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
-    field public static final androidx.health.services.client.data.ExerciseType ICE_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
-    field public static final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
-    field public static final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
-    field public static final androidx.health.services.client.data.ExerciseType LUNGE;
-    field public static final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
-    field public static final androidx.health.services.client.data.ExerciseType MEDITATION;
-    field public static final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
-    field public static final androidx.health.services.client.data.ExerciseType ORIENTEERING;
-    field public static final androidx.health.services.client.data.ExerciseType PADDLING;
-    field public static final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
-    field public static final androidx.health.services.client.data.ExerciseType PILATES;
-    field public static final androidx.health.services.client.data.ExerciseType PLANK;
-    field public static final androidx.health.services.client.data.ExerciseType RACQUETBALL;
-    field public static final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
-    field public static final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
-    field public static final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType ROWING;
-    field public static final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
-    field public static final androidx.health.services.client.data.ExerciseType RUGBY;
-    field public static final androidx.health.services.client.data.ExerciseType RUNNING;
-    field public static final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
-    field public static final androidx.health.services.client.data.ExerciseType SAILING;
-    field public static final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
-    field public static final androidx.health.services.client.data.ExerciseType SKATING;
-    field public static final androidx.health.services.client.data.ExerciseType SKIING;
-    field public static final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
-    field public static final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
-    field public static final androidx.health.services.client.data.ExerciseType SOCCER;
-    field public static final androidx.health.services.client.data.ExerciseType SOFTBALL;
-    field public static final androidx.health.services.client.data.ExerciseType SQUASH;
-    field public static final androidx.health.services.client.data.ExerciseType SQUAT;
-    field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
-    field public static final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
-    field public static final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
-    field public static final androidx.health.services.client.data.ExerciseType STRETCHING;
-    field public static final androidx.health.services.client.data.ExerciseType SURFING;
-    field public static final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
-    field public static final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
-    field public static final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
-    field public static final androidx.health.services.client.data.ExerciseType TENNIS;
-    field public static final androidx.health.services.client.data.ExerciseType UNKNOWN;
-    field public static final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
-    field public static final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
-    field public static final androidx.health.services.client.data.ExerciseType WALKING;
-    field public static final androidx.health.services.client.data.ExerciseType WATER_POLO;
-    field public static final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
-    field public static final androidx.health.services.client.data.ExerciseType WORKOUT;
-    field public static final androidx.health.services.client.data.ExerciseType YACHTING;
-    field public static final androidx.health.services.client.data.ExerciseType YOGA;
-  }
-
-  public static final class ExerciseType.Companion {
-    method public androidx.health.services.client.data.ExerciseType fromId(int id);
-  }
-
-  public final class ExerciseTypeCapabilities {
-    ctor public ExerciseTypeCapabilities(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypes, java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals, java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,? extends java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones, boolean supportsAutoPauseAndResume);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypes();
-    method public java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedGoals();
-    method public java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> getSupportedMilestones();
-    method public boolean getSupportsAutoPauseAndResume();
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypes;
-    property public final java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedGoals;
-    property public final java.util.Map<androidx.health.services.client.data.AggregateDataType<?,?>,java.util.Set<androidx.health.services.client.data.ComparisonType>> supportedMilestones;
-    property public final boolean supportsAutoPauseAndResume;
-  }
-
-  public abstract class ExerciseTypeConfig {
-    field public static final androidx.health.services.client.data.ExerciseTypeConfig.Companion Companion;
-  }
-
-  public static final class ExerciseTypeConfig.Companion {
-  }
-
-  public final class ExerciseUpdate {
-    method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.IntervalDataPoint<?> dataPoint);
-    method public java.time.Duration getActiveDurationAtDataPoint(androidx.health.services.client.data.SampleDataPoint<?> dataPoint);
-    method public androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? getActiveDurationCheckpoint();
-    method public androidx.health.services.client.data.ExerciseConfig? getExerciseConfig();
-    method public androidx.health.services.client.data.ExerciseStateInfo getExerciseStateInfo();
-    method public java.util.Set<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number>> getLatestAchievedGoals();
-    method public androidx.health.services.client.data.DataPointContainer getLatestMetrics();
-    method public java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> getLatestMilestoneMarkerSummaries();
-    method public java.time.Instant? getStartTime();
-    method public java.time.Duration getUpdateDurationFromBoot();
-    property public final androidx.health.services.client.data.ExerciseUpdate.ActiveDurationCheckpoint? activeDurationCheckpoint;
-    property public final androidx.health.services.client.data.ExerciseConfig? exerciseConfig;
-    property public final androidx.health.services.client.data.ExerciseStateInfo exerciseStateInfo;
-    property public final java.util.Set<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number>> latestAchievedGoals;
-    property public final androidx.health.services.client.data.DataPointContainer latestMetrics;
-    property public final java.util.Set<androidx.health.services.client.data.MilestoneMarkerSummary> latestMilestoneMarkerSummaries;
-    property public final java.time.Instant? startTime;
-    field public static final androidx.health.services.client.data.ExerciseUpdate.Companion Companion;
-  }
-
-  public static final class ExerciseUpdate.ActiveDurationCheckpoint {
-    ctor public ExerciseUpdate.ActiveDurationCheckpoint(java.time.Instant time, java.time.Duration activeDuration);
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getTime();
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant time;
-  }
-
-  public static final class ExerciseUpdate.Companion {
-  }
-
-  public final class GolfExerciseTypeConfig extends androidx.health.services.client.data.ExerciseTypeConfig {
-    ctor public GolfExerciseTypeConfig(optional androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo golfShotTrackingPlaceInfo);
-    method public androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo getGolfShotTrackingPlaceInfo();
-    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo golfShotTrackingPlaceInfo;
-  }
-
-  public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo {
-    method public int getPlaceInfoId();
-    property public final int placeInfoId;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion Companion;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_FAIRWAY;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_PUTTING_GREEN;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_TEE_BOX;
-    field public static final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_UNSPECIFIED;
-  }
-
-  public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion {
-  }
-
-  public final class HealthEvent {
-    ctor public HealthEvent(androidx.health.services.client.data.HealthEvent.Type type, java.time.Instant eventTime, androidx.health.services.client.data.DataPointContainer metrics);
-    method public java.time.Instant getEventTime();
-    method public androidx.health.services.client.data.DataPointContainer getMetrics();
-    method public androidx.health.services.client.data.HealthEvent.Type getType();
-    property public final java.time.Instant eventTime;
-    property public final androidx.health.services.client.data.DataPointContainer metrics;
-    property public final androidx.health.services.client.data.HealthEvent.Type type;
-  }
-
-  public static final class HealthEvent.Type {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.HealthEvent.Type.Companion Companion;
-    field public static final androidx.health.services.client.data.HealthEvent.Type FALL_DETECTED;
-    field public static final androidx.health.services.client.data.HealthEvent.Type UNKNOWN;
-  }
-
-  public static final class HealthEvent.Type.Companion {
-  }
-
-  public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
-    ctor public HeartRateAccuracy(androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus);
-    method public androidx.health.services.client.data.HeartRateAccuracy.SensorStatus getSensorStatus();
-    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus sensorStatus;
-  }
-
-  public static final class HeartRateAccuracy.SensorStatus {
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus.Companion Companion;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
-    field public static final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
-  }
-
-  public static final class HeartRateAccuracy.SensorStatus.Companion {
-  }
-
-  public final class IntervalDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public IntervalDataPoint(androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> dataType, T value, java.time.Duration startDurationFromBoot, java.time.Duration endDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
-    method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
-    method public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> getDataType();
-    method public java.time.Duration getEndDurationFromBoot();
-    method public java.time.Instant getEndInstant(java.time.Instant bootInstant);
-    method public android.os.Bundle getMetadata();
-    method public java.time.Duration getStartDurationFromBoot();
-    method public java.time.Instant getStartInstant(java.time.Instant bootInstant);
-    method public T getValue();
-    property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
-    property public androidx.health.services.client.data.DataType<T,? extends androidx.health.services.client.data.IntervalDataPoint<T>> dataType;
-    property public final java.time.Duration endDurationFromBoot;
-    property public final android.os.Bundle metadata;
-    property public final java.time.Duration startDurationFromBoot;
-    property public final T value;
-  }
-
-  public final class LocationAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
-    ctor public LocationAccuracy(@FloatRange(from=0.0) double horizontalPositionErrorMeters, optional @FloatRange(from=0.0) double verticalPositionErrorMeters);
-    method public double getHorizontalPositionErrorMeters();
-    method public double getVerticalPositionErrorMeters();
-    property public final double horizontalPositionErrorMeters;
-    property public final double verticalPositionErrorMeters;
-    field public static final androidx.health.services.client.data.LocationAccuracy.Companion Companion;
-  }
-
-  public static final class LocationAccuracy.Companion {
-  }
-
-  public final class LocationAvailability implements androidx.health.services.client.data.Availability {
-    method public static androidx.health.services.client.data.LocationAvailability? fromId(int id);
-    method public int getId();
-    method public String getName();
-    property public int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
-    field public static final androidx.health.services.client.data.LocationAvailability ACQUIRING;
-    field public static final androidx.health.services.client.data.LocationAvailability.Companion Companion;
-    field public static final androidx.health.services.client.data.LocationAvailability NO_GNSS;
-    field public static final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
-    field public static final androidx.health.services.client.data.LocationAvailability UNKNOWN;
-  }
-
-  public static final class LocationAvailability.Companion {
-    method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
-  }
-
-  public final class LocationData {
-    ctor public LocationData(@FloatRange(from=-90.0, to=90.0) double latitude, @FloatRange(from=-180.0, to=180.0) double longitude, optional double altitude, optional double bearing);
-    method public double getAltitude();
-    method public double getBearing();
-    method public double getLatitude();
-    method public double getLongitude();
-    property public final double altitude;
-    property public final double bearing;
-    property public final double latitude;
-    property public final double longitude;
-    field public static final double ALTITUDE_UNAVAILABLE = (0.0/0.0);
-    field public static final double BEARING_UNAVAILABLE = (0.0/0.0);
-  }
-
-  public final class MeasureCapabilities {
-    ctor public MeasureCapabilities(java.util.Set<? extends androidx.health.services.client.data.DeltaDataType<?,?>> supportedDataTypesMeasure);
-    method public java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> getSupportedDataTypesMeasure();
-    property public final java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> supportedDataTypesMeasure;
-  }
-
-  public final class MilestoneMarkerSummary {
-    ctor public MilestoneMarkerSummary(java.time.Instant startTime, java.time.Instant endTime, java.time.Duration activeDuration, androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> achievedGoal, androidx.health.services.client.data.DataPointContainer summaryMetrics);
-    method public androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> getAchievedGoal();
-    method public java.time.Duration getActiveDuration();
-    method public java.time.Instant getEndTime();
-    method public java.time.Instant getStartTime();
-    method public androidx.health.services.client.data.DataPointContainer getSummaryMetrics();
-    property public final androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Number> achievedGoal;
-    property public final java.time.Duration activeDuration;
-    property public final java.time.Instant endTime;
-    property public final java.time.Instant startTime;
-    property public final androidx.health.services.client.data.DataPointContainer summaryMetrics;
-  }
-
-  public final class PassiveGoal {
-    ctor public PassiveGoal(androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> dataTypeCondition);
-    method public androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> getDataTypeCondition();
-    property public final androidx.health.services.client.data.DataTypeCondition<? extends java.lang.Number,? extends androidx.health.services.client.data.DeltaDataType<? extends java.lang.Number,?>> dataTypeCondition;
-  }
-
-  public final class PassiveListenerConfig {
-    ctor public PassiveListenerConfig(java.util.Set<? extends androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> dataTypes, boolean shouldUserActivityInfoBeRequested, java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals, java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes);
-    method public static androidx.health.services.client.data.PassiveListenerConfig.Builder builder();
-    method public java.util.Set<androidx.health.services.client.data.PassiveGoal> getDailyGoals();
-    method public java.util.Set<androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> getDataTypes();
-    method public java.util.Set<androidx.health.services.client.data.HealthEvent.Type> getHealthEventTypes();
-    method public boolean getShouldUserActivityInfoBeRequested();
-    property public final java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<? extends java.lang.Object,? extends androidx.health.services.client.data.DataPoint<?>>> dataTypes;
-    property public final java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes;
-    property public final boolean shouldUserActivityInfoBeRequested;
-    field public static final androidx.health.services.client.data.PassiveListenerConfig.Companion Companion;
-  }
-
-  public static final class PassiveListenerConfig.Builder {
-    ctor public PassiveListenerConfig.Builder();
-    method public androidx.health.services.client.data.PassiveListenerConfig build();
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setDailyGoals(java.util.Set<androidx.health.services.client.data.PassiveGoal> dailyGoals);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setDataTypes(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> dataTypes);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setHealthEventTypes(java.util.Set<androidx.health.services.client.data.HealthEvent.Type> healthEventTypes);
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder setShouldUserActivityInfoBeRequested(boolean shouldUserActivityInfoBeRequested);
-  }
-
-  public static final class PassiveListenerConfig.Companion {
-    method public androidx.health.services.client.data.PassiveListenerConfig.Builder builder();
-  }
-
-  public final class PassiveMonitoringCapabilities {
-    ctor public PassiveMonitoringCapabilities(java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveMonitoring, java.util.Set<? extends androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveGoals, java.util.Set<androidx.health.services.client.data.HealthEvent.Type> supportedHealthEventTypes, java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates);
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypesPassiveGoals();
-    method public java.util.Set<androidx.health.services.client.data.DataType<?,?>> getSupportedDataTypesPassiveMonitoring();
-    method public java.util.Set<androidx.health.services.client.data.HealthEvent.Type> getSupportedHealthEventTypes();
-    method public java.util.Set<androidx.health.services.client.data.UserActivityState> getSupportedUserActivityStates();
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveGoals;
-    property public final java.util.Set<androidx.health.services.client.data.DataType<?,?>> supportedDataTypesPassiveMonitoring;
-    property public final java.util.Set<androidx.health.services.client.data.HealthEvent.Type> supportedHealthEventTypes;
-    property public final java.util.Set<androidx.health.services.client.data.UserActivityState> supportedUserActivityStates;
-  }
-
-  public final class PassiveMonitoringUpdate {
-    ctor public PassiveMonitoringUpdate(androidx.health.services.client.data.DataPointContainer dataPoints, java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates);
-    method public androidx.health.services.client.data.DataPointContainer getDataPoints();
-    method public java.util.List<androidx.health.services.client.data.UserActivityInfo> getUserActivityInfoUpdates();
-    property public final androidx.health.services.client.data.DataPointContainer dataPoints;
-    property public final java.util.List<androidx.health.services.client.data.UserActivityInfo> userActivityInfoUpdates;
-  }
-
-  public final class SampleDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public SampleDataPoint(androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> dataType, T value, java.time.Duration timeDurationFromBoot, optional android.os.Bundle metadata, optional androidx.health.services.client.data.DataPointAccuracy? accuracy);
-    method public androidx.health.services.client.data.DataPointAccuracy? getAccuracy();
-    method public androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> getDataType();
-    method public android.os.Bundle getMetadata();
-    method public java.time.Duration getTimeDurationFromBoot();
-    method public java.time.Instant getTimeInstant(java.time.Instant bootInstant);
-    method public T getValue();
-    property public final androidx.health.services.client.data.DataPointAccuracy? accuracy;
-    property public androidx.health.services.client.data.DataType<T,androidx.health.services.client.data.SampleDataPoint<T>> dataType;
-    property public final android.os.Bundle metadata;
-    property public final java.time.Duration timeDurationFromBoot;
-    property public final T value;
-  }
-
-  public final class StatisticalDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
-    ctor public StatisticalDataPoint(androidx.health.services.client.data.AggregateDataType<T,androidx.health.services.client.data.StatisticalDataPoint<T>> dataType, T min, T max, T average, java.time.Instant start, java.time.Instant end);
-    method public T getAverage();
-    method public java.time.Instant getEnd();
-    method public T getMax();
-    method public T getMin();
-    method public java.time.Instant getStart();
-    property public final T average;
-    property public final java.time.Instant end;
-    property public final T max;
-    property public final T min;
-    property public final java.time.Instant start;
-    field public static final androidx.health.services.client.data.StatisticalDataPoint.Companion Companion;
-  }
-
-  public static final class StatisticalDataPoint.Companion {
-  }
-
-  public final class UserActivityInfo {
-    ctor public UserActivityInfo(androidx.health.services.client.data.UserActivityState userActivityState, androidx.health.services.client.data.ExerciseInfo? exerciseInfo, java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
-    method public static androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.ExerciseInfo? getExerciseInfo();
-    method public java.time.Instant getStateChangeTime();
-    method public androidx.health.services.client.data.UserActivityState getUserActivityState();
-    property public final androidx.health.services.client.data.ExerciseInfo? exerciseInfo;
-    property public final java.time.Instant stateChangeTime;
-    property public final androidx.health.services.client.data.UserActivityState userActivityState;
-    field public static final androidx.health.services.client.data.UserActivityInfo.Companion Companion;
-  }
-
-  public static final class UserActivityInfo.Companion {
-    method public androidx.health.services.client.data.UserActivityInfo createActiveExerciseState(androidx.health.services.client.data.ExerciseInfo exerciseInfo, java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createAsleepState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createPassiveActivityState(java.time.Instant stateChangeTime);
-    method public androidx.health.services.client.data.UserActivityInfo createUnknownTypeState(java.time.Instant stateChangeTime);
-  }
-
-  public final class UserActivityState {
-    ctor public UserActivityState(int id, String name);
-    method public int getId();
-    method public String getName();
-    property public final int id;
-    property public final String name;
-    field public static final androidx.health.services.client.data.UserActivityState.Companion Companion;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
-    field public static final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
-  }
-
-  public static final class UserActivityState.Companion {
-  }
-
-  public final class WarmUpConfig {
-    ctor public WarmUpConfig(androidx.health.services.client.data.ExerciseType exerciseType, java.util.Set<? extends androidx.health.services.client.data.DeltaDataType<?,?>> dataTypes);
-    method public java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> getDataTypes();
-    method public androidx.health.services.client.data.ExerciseType getExerciseType();
-    property public final java.util.Set<androidx.health.services.client.data.DeltaDataType<?,?>> dataTypes;
-    property public final androidx.health.services.client.data.ExerciseType exerciseType;
-  }
-
-}
-
diff --git a/hilt/hilt-common/api/public_plus_experimental_current.txt b/hilt/hilt-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index 5b7216f..0000000
--- a/hilt/hilt-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Signature format: 4.0
-package androidx.hilt.work {
-
-  @dagger.hilt.GeneratesRootInput @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface HiltWorker {
-  }
-
-}
-
diff --git a/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt b/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt
deleted file mode 100644
index 99cdd72..0000000
--- a/hilt/hilt-navigation-compose/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.hilt.navigation.compose {
-
-  public final class HiltViewModelKt {
-    method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM hiltViewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key);
-  }
-
-}
-
diff --git a/hilt/hilt-navigation/api/public_plus_experimental_current.txt b/hilt/hilt-navigation/api/public_plus_experimental_current.txt
deleted file mode 100644
index 551dabc..0000000
--- a/hilt/hilt-navigation/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 4.0
-package androidx.hilt.navigation {
-
-  public final class HiltViewModelFactory {
-    method public static androidx.lifecycle.ViewModelProvider.Factory create(android.content.Context context, androidx.lifecycle.ViewModelProvider.Factory delegateFactory);
-    method public static androidx.lifecycle.ViewModelProvider.Factory create(android.content.Context context, androidx.navigation.NavBackStackEntry navBackStackEntry);
-  }
-
-}
-
diff --git a/hilt/hilt-work/api/public_plus_experimental_current.txt b/hilt/hilt-work/api/public_plus_experimental_current.txt
deleted file mode 100644
index 09dc5535..0000000
--- a/hilt/hilt-work/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.hilt.work {
-
-  public final class HiltWorkerFactory extends androidx.work.WorkerFactory {
-    method public androidx.work.ListenableWorker? createWorker(android.content.Context, String, androidx.work.WorkerParameters);
-  }
-
-}
-
diff --git a/input/input-motionprediction/api/public_plus_experimental_1.0.0-beta02.txt b/input/input-motionprediction/api/public_plus_experimental_1.0.0-beta02.txt
deleted file mode 100644
index b0eef8e..0000000
--- a/input/input-motionprediction/api/public_plus_experimental_1.0.0-beta02.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Signature format: 4.0
-package androidx.input.motionprediction {
-
-  public interface MotionEventPredictor {
-    method public static androidx.input.motionprediction.MotionEventPredictor newInstance(android.view.View);
-    method public android.view.MotionEvent? predict();
-    method public void record(android.view.MotionEvent);
-  }
-
-}
-
diff --git a/input/input-motionprediction/api/public_plus_experimental_current.txt b/input/input-motionprediction/api/public_plus_experimental_current.txt
deleted file mode 100644
index b0eef8e..0000000
--- a/input/input-motionprediction/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Signature format: 4.0
-package androidx.input.motionprediction {
-
-  public interface MotionEventPredictor {
-    method public static androidx.input.motionprediction.MotionEventPredictor newInstance(android.view.View);
-    method public android.view.MotionEvent? predict();
-    method public void record(android.view.MotionEvent);
-  }
-
-}
-
diff --git a/inspection/inspection/api/public_plus_experimental_current.txt b/inspection/inspection/api/public_plus_experimental_current.txt
deleted file mode 100644
index ef4a1f0..0000000
--- a/inspection/inspection/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Signature format: 4.0
-package androidx.inspection {
-
-  public interface ArtTooling {
-    method public <T> java.util.List<T!> findInstances(Class<T!>);
-    method public void registerEntryHook(Class<?>, String, androidx.inspection.ArtTooling.EntryHook);
-    method public <T> void registerExitHook(Class<?>, String, androidx.inspection.ArtTooling.ExitHook<T!>);
-  }
-
-  public static interface ArtTooling.EntryHook {
-    method public void onEntry(Object?, java.util.List<java.lang.Object!>);
-  }
-
-  public static interface ArtTooling.ExitHook<T> {
-    method public T! onExit(T!);
-  }
-
-  public abstract class Connection {
-    ctor public Connection();
-    method public void sendEvent(byte[]);
-  }
-
-  public abstract class Inspector {
-    ctor public Inspector(androidx.inspection.Connection);
-    method protected final androidx.inspection.Connection getConnection();
-    method public void onDispose();
-    method public abstract void onReceiveCommand(byte[], androidx.inspection.Inspector.CommandCallback);
-  }
-
-  public static interface Inspector.CommandCallback {
-    method public void addCancellationListener(java.util.concurrent.Executor, Runnable);
-    method public void reply(byte[]);
-  }
-
-  public interface InspectorEnvironment {
-    method public androidx.inspection.ArtTooling artTooling();
-    method public default androidx.inspection.InspectorExecutors executors();
-  }
-
-  public interface InspectorExecutors {
-    method public android.os.Handler handler();
-    method public java.util.concurrent.Executor io();
-    method public java.util.concurrent.Executor primary();
-  }
-
-  public abstract class InspectorFactory<T extends androidx.inspection.Inspector> {
-    ctor public InspectorFactory(String);
-    method public abstract T createInspector(androidx.inspection.Connection, androidx.inspection.InspectorEnvironment);
-    method public final String getInspectorId();
-  }
-
-}
-
diff --git a/interpolator/interpolator/api/public_plus_experimental_current.txt b/interpolator/interpolator/api/public_plus_experimental_current.txt
deleted file mode 100644
index 26c15b9..0000000
--- a/interpolator/interpolator/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Signature format: 4.0
-package androidx.interpolator.view.animation {
-
-  public class FastOutExtraSlowInInterpolator implements android.view.animation.Interpolator {
-    ctor public FastOutExtraSlowInInterpolator();
-    method public float getInterpolation(float);
-  }
-
-  public class FastOutLinearInInterpolator implements android.view.animation.Interpolator {
-    ctor public FastOutLinearInInterpolator();
-    method public float getInterpolation(float);
-  }
-
-  public class FastOutSlowInInterpolator implements android.view.animation.Interpolator {
-    ctor public FastOutSlowInInterpolator();
-    method public float getInterpolation(float);
-  }
-
-  public class LinearOutSlowInInterpolator implements android.view.animation.Interpolator {
-    ctor public LinearOutSlowInInterpolator();
-    method public float getInterpolation(float);
-  }
-
-}
-
diff --git a/javascriptengine/javascriptengine/api/public_plus_experimental_current.txt b/javascriptengine/javascriptengine/api/public_plus_experimental_current.txt
deleted file mode 100644
index 27d3a38..0000000
--- a/javascriptengine/javascriptengine/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-// Signature format: 4.0
-package androidx.javascriptengine {
-
-  public final class EvaluationFailedException extends androidx.javascriptengine.JavaScriptException {
-    ctor public EvaluationFailedException(String);
-  }
-
-  public final class EvaluationResultSizeLimitExceededException extends androidx.javascriptengine.JavaScriptException {
-    ctor public EvaluationResultSizeLimitExceededException();
-    ctor public EvaluationResultSizeLimitExceededException(String);
-  }
-
-  public final class IsolateStartupParameters {
-    ctor public IsolateStartupParameters();
-    method @IntRange(from=0) public int getMaxEvaluationReturnSizeBytes();
-    method @IntRange(from=0) public long getMaxHeapSizeBytes();
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_EVALUATE_WITHOUT_TRANSACTION_LIMIT, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public void setMaxEvaluationReturnSizeBytes(@IntRange(from=0) int);
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_ISOLATE_MAX_HEAP_SIZE, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public void setMaxHeapSizeBytes(@IntRange(from=0) long);
-    field public static final long DEFAULT_ISOLATE_HEAP_SIZE = 0L; // 0x0L
-    field public static final int DEFAULT_MAX_EVALUATION_RETURN_SIZE_BYTES = 20971520; // 0x1400000
-  }
-
-  public final class IsolateTerminatedException extends androidx.javascriptengine.JavaScriptException {
-    ctor public IsolateTerminatedException();
-  }
-
-  public interface JavaScriptConsoleCallback {
-    method public default void onConsoleClear();
-    method public void onConsoleMessage(androidx.javascriptengine.JavaScriptConsoleCallback.ConsoleMessage);
-  }
-
-  public static final class JavaScriptConsoleCallback.ConsoleMessage {
-    ctor public JavaScriptConsoleCallback.ConsoleMessage(int, String, String, int, int, String?);
-    method public int getColumn();
-    method public int getLevel();
-    method public int getLine();
-    method public String getMessage();
-    method public String getSource();
-    method public String? getTrace();
-    field public static final int LEVEL_DEBUG = 2; // 0x2
-    field public static final int LEVEL_ERROR = 8; // 0x8
-    field public static final int LEVEL_INFO = 4; // 0x4
-    field public static final int LEVEL_LOG = 1; // 0x1
-    field public static final int LEVEL_WARNING = 16; // 0x10
-  }
-
-  public class JavaScriptException extends java.lang.Exception {
-    ctor public JavaScriptException();
-    ctor public JavaScriptException(String);
-  }
-
-  public final class JavaScriptIsolate implements java.lang.AutoCloseable {
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_CONSOLE_MESSAGING, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public void clearConsoleCallback();
-    method public void close();
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_EVALUATE_WITHOUT_TRANSACTION_LIMIT, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public com.google.common.util.concurrent.ListenableFuture<java.lang.String!> evaluateJavaScriptAsync(byte[]);
-    method public com.google.common.util.concurrent.ListenableFuture<java.lang.String!> evaluateJavaScriptAsync(String);
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_PROVIDE_CONSUME_ARRAY_BUFFER, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public boolean provideNamedData(String, byte[]);
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_CONSOLE_MESSAGING, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public void setConsoleCallback(androidx.javascriptengine.JavaScriptConsoleCallback);
-    method @RequiresFeature(name=androidx.javascriptengine.JavaScriptSandbox.JS_FEATURE_CONSOLE_MESSAGING, enforcement="androidx.javascriptengine.JavaScriptSandbox#isFeatureSupported") public void setConsoleCallback(java.util.concurrent.Executor, androidx.javascriptengine.JavaScriptConsoleCallback);
-  }
-
-  public final class JavaScriptSandbox implements java.lang.AutoCloseable {
-    method public void close();
-    method public static com.google.common.util.concurrent.ListenableFuture<androidx.javascriptengine.JavaScriptSandbox!> createConnectedInstanceAsync(android.content.Context);
-    method public androidx.javascriptengine.JavaScriptIsolate createIsolate();
-    method public androidx.javascriptengine.JavaScriptIsolate createIsolate(androidx.javascriptengine.IsolateStartupParameters);
-    method public boolean isFeatureSupported(String);
-    method public static boolean isSupported();
-    field public static final String JS_FEATURE_CONSOLE_MESSAGING = "JS_FEATURE_CONSOLE_MESSAGING";
-    field public static final String JS_FEATURE_EVALUATE_WITHOUT_TRANSACTION_LIMIT = "JS_FEATURE_EVALUATE_WITHOUT_TRANSACTION_LIMIT";
-    field public static final String JS_FEATURE_ISOLATE_MAX_HEAP_SIZE = "JS_FEATURE_ISOLATE_MAX_HEAP_SIZE";
-    field public static final String JS_FEATURE_ISOLATE_TERMINATION = "JS_FEATURE_ISOLATE_TERMINATION";
-    field public static final String JS_FEATURE_PROMISE_RETURN = "JS_FEATURE_PROMISE_RETURN";
-    field public static final String JS_FEATURE_PROVIDE_CONSUME_ARRAY_BUFFER = "JS_FEATURE_PROVIDE_CONSUME_ARRAY_BUFFER";
-    field public static final String JS_FEATURE_WASM_COMPILATION = "JS_FEATURE_WASM_COMPILATION";
-  }
-
-  public final class MemoryLimitExceededException extends androidx.javascriptengine.JavaScriptException {
-    ctor public MemoryLimitExceededException();
-    ctor public MemoryLimitExceededException(String);
-  }
-
-  public final class SandboxDeadException extends androidx.javascriptengine.JavaScriptException {
-    ctor public SandboxDeadException();
-  }
-
-  public final class SandboxUnsupportedException extends java.lang.RuntimeException {
-    ctor public SandboxUnsupportedException(String);
-  }
-
-}
-
diff --git a/leanback/leanback-grid/api/public_plus_experimental_current.txt b/leanback/leanback-grid/api/public_plus_experimental_current.txt
deleted file mode 100644
index 36986e2..0000000
--- a/leanback/leanback-grid/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,207 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.widget {
-
-  public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
-    method public void addOnChildViewHolderSelectedListener(androidx.leanback.widget.OnChildViewHolderSelectedListener);
-    method public final void addOnLayoutCompletedListener(androidx.leanback.widget.BaseGridView.OnLayoutCompletedListener);
-    method public void animateIn();
-    method public void animateOut();
-    method public int getChildDrawingOrder(int, int);
-    method @Deprecated public int getHorizontalMargin();
-    method public int getHorizontalSpacing();
-    method public int getInitialPrefetchItemCount();
-    method public int getItemAlignmentOffset();
-    method public float getItemAlignmentOffsetPercent();
-    method public int getItemAlignmentViewId();
-    method public androidx.leanback.widget.BaseGridView.OnUnhandledKeyListener? getOnUnhandledKeyListener();
-    method public final int getSaveChildrenLimitNumber();
-    method public final int getSaveChildrenPolicy();
-    method public int getSelectedPosition();
-    method public androidx.leanback.widget.BaseGridView.SmoothScrollByBehavior? getSmoothScrollByBehavior();
-    method public final int getSmoothScrollMaxPendingMoves();
-    method public final float getSmoothScrollSpeedFactor();
-    method @Deprecated public int getVerticalMargin();
-    method public int getVerticalSpacing();
-    method public void getViewSelectedOffsets(android.view.View, int[]);
-    method public int getWindowAlignment();
-    method public int getWindowAlignmentOffset();
-    method public float getWindowAlignmentOffsetPercent();
-    method public boolean hasPreviousViewInSameRow(int);
-    method public boolean isChildLayoutAnimated();
-    method public boolean isFocusDrawingOrderEnabled();
-    method public final boolean isFocusSearchDisabled();
-    method public boolean isItemAlignmentOffsetWithPadding();
-    method public boolean isScrollEnabled();
-    method public boolean isWindowAlignmentPreferKeyLineOverHighEdge();
-    method public boolean isWindowAlignmentPreferKeyLineOverLowEdge();
-    method public boolean onRequestFocusInDescendants(int, android.graphics.Rect?);
-    method public void removeOnChildViewHolderSelectedListener(androidx.leanback.widget.OnChildViewHolderSelectedListener);
-    method public final void removeOnLayoutCompletedListener(androidx.leanback.widget.BaseGridView.OnLayoutCompletedListener);
-    method public void setAnimateChildLayout(boolean);
-    method public void setChildrenVisibility(int);
-    method public void setFocusDrawingOrderEnabled(boolean);
-    method public final void setFocusSearchDisabled(boolean);
-    method public void setGravity(int);
-    method public void setHasOverlappingRendering(boolean);
-    method @Deprecated public void setHorizontalMargin(int);
-    method public void setHorizontalSpacing(int);
-    method public void setInitialPrefetchItemCount(int);
-    method public void setItemAlignmentOffset(int);
-    method public void setItemAlignmentOffsetPercent(float);
-    method public void setItemAlignmentOffsetWithPadding(boolean);
-    method public void setItemAlignmentViewId(int);
-    method @Deprecated public void setItemMargin(int);
-    method public void setItemSpacing(int);
-    method public void setLayoutEnabled(boolean);
-    method public void setOnChildLaidOutListener(androidx.leanback.widget.OnChildLaidOutListener?);
-    method public void setOnChildSelectedListener(androidx.leanback.widget.OnChildSelectedListener?);
-    method public void setOnChildViewHolderSelectedListener(androidx.leanback.widget.OnChildViewHolderSelectedListener?);
-    method public void setOnKeyInterceptListener(androidx.leanback.widget.BaseGridView.OnKeyInterceptListener?);
-    method public void setOnMotionInterceptListener(androidx.leanback.widget.BaseGridView.OnMotionInterceptListener?);
-    method public void setOnTouchInterceptListener(androidx.leanback.widget.BaseGridView.OnTouchInterceptListener?);
-    method public void setOnUnhandledKeyListener(androidx.leanback.widget.BaseGridView.OnUnhandledKeyListener?);
-    method public void setPruneChild(boolean);
-    method public final void setSaveChildrenLimitNumber(int);
-    method public final void setSaveChildrenPolicy(int);
-    method public void setScrollEnabled(boolean);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, androidx.leanback.widget.ViewHolderTask?);
-    method public void setSelectedPosition(int, int);
-    method public void setSelectedPositionSmooth(int);
-    method public void setSelectedPositionSmooth(int, androidx.leanback.widget.ViewHolderTask?);
-    method public final void setSmoothScrollByBehavior(androidx.leanback.widget.BaseGridView.SmoothScrollByBehavior?);
-    method public final void setSmoothScrollMaxPendingMoves(int);
-    method public final void setSmoothScrollSpeedFactor(float);
-    method @Deprecated public void setVerticalMargin(int);
-    method public void setVerticalSpacing(int);
-    method public void setWindowAlignment(int);
-    method public void setWindowAlignmentOffset(int);
-    method public void setWindowAlignmentOffsetPercent(float);
-    method public void setWindowAlignmentPreferKeyLineOverHighEdge(boolean);
-    method public void setWindowAlignmentPreferKeyLineOverLowEdge(boolean);
-    field public static final float ITEM_ALIGN_OFFSET_PERCENT_DISABLED = -1.0f;
-    field public static final int SAVE_ALL_CHILD = 3; // 0x3
-    field public static final int SAVE_LIMITED_CHILD = 2; // 0x2
-    field public static final int SAVE_NO_CHILD = 0; // 0x0
-    field public static final int SAVE_ON_SCREEN_CHILD = 1; // 0x1
-    field public static final int WINDOW_ALIGN_BOTH_EDGE = 3; // 0x3
-    field public static final int WINDOW_ALIGN_HIGH_EDGE = 2; // 0x2
-    field public static final int WINDOW_ALIGN_LOW_EDGE = 1; // 0x1
-    field public static final int WINDOW_ALIGN_NO_EDGE = 0; // 0x0
-    field public static final float WINDOW_ALIGN_OFFSET_PERCENT_DISABLED = -1.0f;
-  }
-
-  public static interface BaseGridView.OnKeyInterceptListener {
-    method public boolean onInterceptKeyEvent(android.view.KeyEvent);
-  }
-
-  public static interface BaseGridView.OnLayoutCompletedListener {
-    method public void onLayoutCompleted(androidx.recyclerview.widget.RecyclerView.State);
-  }
-
-  public static interface BaseGridView.OnMotionInterceptListener {
-    method public boolean onInterceptMotionEvent(android.view.MotionEvent);
-  }
-
-  public static interface BaseGridView.OnTouchInterceptListener {
-    method public boolean onInterceptTouchEvent(android.view.MotionEvent);
-  }
-
-  public static interface BaseGridView.OnUnhandledKeyListener {
-    method public boolean onUnhandledKey(android.view.KeyEvent);
-  }
-
-  public static interface BaseGridView.SmoothScrollByBehavior {
-    method public int configSmoothScrollByDuration(int, int);
-    method public android.view.animation.Interpolator? configSmoothScrollByInterpolator(int, int);
-  }
-
-  public interface FacetProvider {
-    method public Object? getFacet(Class<?>);
-  }
-
-  public interface FacetProviderAdapter {
-    method public androidx.leanback.widget.FacetProvider? getFacetProvider(int);
-  }
-
-  public final class GridLayoutManager extends androidx.recyclerview.widget.RecyclerView.LayoutManager {
-    ctor public GridLayoutManager();
-    method public androidx.recyclerview.widget.RecyclerView.LayoutParams generateDefaultLayoutParams();
-    method public void setFocusOutAllowed(boolean, boolean);
-    method public void setOrientation(int);
-  }
-
-  public class HorizontalGridView extends androidx.leanback.widget.BaseGridView {
-    ctor public HorizontalGridView(android.content.Context);
-    ctor public HorizontalGridView(android.content.Context, android.util.AttributeSet?);
-    ctor public HorizontalGridView(android.content.Context, android.util.AttributeSet?, int);
-    method public final boolean getFadingLeftEdge();
-    method public final int getFadingLeftEdgeLength();
-    method public final int getFadingLeftEdgeOffset();
-    method public final boolean getFadingRightEdge();
-    method public final int getFadingRightEdgeLength();
-    method public final int getFadingRightEdgeOffset();
-    method protected void initAttributes(android.content.Context, android.util.AttributeSet?);
-    method public final void setFadingLeftEdge(boolean);
-    method public final void setFadingLeftEdgeLength(int);
-    method public final void setFadingLeftEdgeOffset(int);
-    method public final void setFadingRightEdge(boolean);
-    method public final void setFadingRightEdgeLength(int);
-    method public final void setFadingRightEdgeOffset(int);
-    method public void setNumRows(int);
-    method public void setRowHeight(int);
-  }
-
-  public final class ItemAlignmentFacet {
-    ctor public ItemAlignmentFacet();
-    method public androidx.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef![] getAlignmentDefs();
-    method public boolean isMultiAlignment();
-    method public void setAlignmentDefs(androidx.leanback.widget.ItemAlignmentFacet.ItemAlignmentDef![]);
-    field public static final float ITEM_ALIGN_OFFSET_PERCENT_DISABLED = -1.0f;
-  }
-
-  public static class ItemAlignmentFacet.ItemAlignmentDef {
-    ctor public ItemAlignmentFacet.ItemAlignmentDef();
-    method public final int getItemAlignmentFocusViewId();
-    method public final int getItemAlignmentOffset();
-    method public final float getItemAlignmentOffsetPercent();
-    method public final int getItemAlignmentViewId();
-    method public boolean isAlignedToTextViewBaseLine();
-    method public final boolean isItemAlignmentOffsetWithPadding();
-    method public final void setAlignedToTextViewBaseline(boolean);
-    method public final void setItemAlignmentFocusViewId(int);
-    method public final void setItemAlignmentOffset(int);
-    method public final void setItemAlignmentOffsetPercent(float);
-    method public final void setItemAlignmentOffsetWithPadding(boolean);
-    method public final void setItemAlignmentViewId(int);
-  }
-
-  public interface OnChildLaidOutListener {
-    method public void onChildLaidOut(android.view.ViewGroup, android.view.View, int, long);
-  }
-
-  @Deprecated public interface OnChildSelectedListener {
-    method @Deprecated public void onChildSelected(android.view.ViewGroup, android.view.View?, int, long);
-  }
-
-  public abstract class OnChildViewHolderSelectedListener {
-    ctor public OnChildViewHolderSelectedListener();
-    method public void onChildViewHolderSelected(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder?, int, int);
-    method public void onChildViewHolderSelectedAndPositioned(androidx.recyclerview.widget.RecyclerView, androidx.recyclerview.widget.RecyclerView.ViewHolder?, int, int);
-  }
-
-  public class VerticalGridView extends androidx.leanback.widget.BaseGridView {
-    ctor public VerticalGridView(android.content.Context);
-    ctor public VerticalGridView(android.content.Context, android.util.AttributeSet?);
-    ctor public VerticalGridView(android.content.Context, android.util.AttributeSet?, int);
-    method protected void initAttributes(android.content.Context, android.util.AttributeSet?);
-    method public void setColumnWidth(int);
-    method public void setNumColumns(int);
-  }
-
-  public interface ViewHolderTask {
-    method public void run(androidx.recyclerview.widget.RecyclerView.ViewHolder);
-  }
-
-}
-
diff --git a/leanback/leanback-paging/api/public_plus_experimental_current.txt b/leanback/leanback-paging/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9d1f3f0..0000000
--- a/leanback/leanback-paging/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.paging {
-
-  public final class PagingDataAdapter<T> extends androidx.leanback.widget.ObjectAdapter {
-    ctor public PagingDataAdapter(androidx.leanback.widget.Presenter presenter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    ctor public PagingDataAdapter(androidx.leanback.widget.Presenter presenter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher);
-    ctor public PagingDataAdapter(androidx.leanback.widget.Presenter presenter, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher, optional kotlinx.coroutines.CoroutineDispatcher workerDispatcher);
-    ctor public PagingDataAdapter(androidx.leanback.widget.PresenterSelector presenterSelector, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    ctor public PagingDataAdapter(androidx.leanback.widget.PresenterSelector presenterSelector, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher);
-    ctor public PagingDataAdapter(androidx.leanback.widget.PresenterSelector presenterSelector, androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher, optional kotlinx.coroutines.CoroutineDispatcher workerDispatcher);
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback);
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, optional kotlinx.coroutines.CoroutineDispatcher mainDispatcher);
-    ctor public PagingDataAdapter(androidx.recyclerview.widget.DiffUtil.ItemCallback<T> diffCallback, 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 T? get(int position);
-    method public kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> getLoadStateFlow();
-    method 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 retry();
-    method public int size();
-    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 kotlinx.coroutines.flow.Flow<androidx.paging.CombinedLoadStates> loadStateFlow;
-  }
-
-}
-
diff --git a/leanback/leanback-preference/api/public_plus_experimental_current.txt b/leanback/leanback-preference/api/public_plus_experimental_current.txt
deleted file mode 100644
index 55e5b84..0000000
--- a/leanback/leanback-preference/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.preference {
-
-  @Deprecated public abstract class BaseLeanbackPreferenceFragment extends androidx.preference.PreferenceFragment {
-    ctor @Deprecated public BaseLeanbackPreferenceFragment();
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView! onCreateRecyclerView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-  }
-
-  public abstract class BaseLeanbackPreferenceFragmentCompat extends androidx.preference.PreferenceFragmentCompat {
-    ctor public BaseLeanbackPreferenceFragmentCompat();
-  }
-
-  public class LeanbackEditTextPreferenceDialogFragmentCompat extends androidx.leanback.preference.LeanbackPreferenceDialogFragmentCompat {
-    ctor public LeanbackEditTextPreferenceDialogFragmentCompat();
-    method public static androidx.leanback.preference.LeanbackEditTextPreferenceDialogFragmentCompat! newInstance(String!);
-    field public static final String EXTRA_IME_OPTIONS = "ime_option";
-    field public static final String EXTRA_INPUT_TYPE = "input_type";
-  }
-
-  @Deprecated public class LeanbackListPreferenceDialogFragment extends androidx.leanback.preference.LeanbackPreferenceDialogFragment {
-    ctor @Deprecated public LeanbackListPreferenceDialogFragment();
-    method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceMulti(String!);
-    method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceSingle(String!);
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView.Adapter! onCreateAdapter();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-  }
-
-  @Deprecated public class LeanbackListPreferenceDialogFragment.AdapterMulti extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder> implements androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener {
-    ctor @Deprecated public LeanbackListPreferenceDialogFragment.AdapterMulti(CharSequence![]!, CharSequence![]!, java.util.Set<java.lang.String!>!);
-    method @Deprecated public int getItemCount();
-    method @Deprecated public void onBindViewHolder(androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder!, int);
-    method @Deprecated public androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder! onCreateViewHolder(android.view.ViewGroup!, int);
-    method @Deprecated public void onItemClick(androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder!);
-  }
-
-  @Deprecated public class LeanbackListPreferenceDialogFragment.AdapterSingle extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder> implements androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener {
-    ctor @Deprecated public LeanbackListPreferenceDialogFragment.AdapterSingle(CharSequence![]!, CharSequence![]!, CharSequence!);
-    method @Deprecated public int getItemCount();
-    method @Deprecated public void onBindViewHolder(androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder!, int);
-    method @Deprecated public androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder! onCreateViewHolder(android.view.ViewGroup!, int);
-    method @Deprecated public void onItemClick(androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder!);
-  }
-
-  @Deprecated public static class LeanbackListPreferenceDialogFragment.ViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements android.view.View.OnClickListener {
-    ctor @Deprecated public LeanbackListPreferenceDialogFragment.ViewHolder(android.view.View, androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener);
-    method @Deprecated public android.view.ViewGroup! getContainer();
-    method @Deprecated public android.widget.TextView! getTitleView();
-    method @Deprecated public android.widget.Checkable! getWidgetView();
-    method @Deprecated public void onClick(android.view.View!);
-  }
-
-  @Deprecated public static interface LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener {
-    method @Deprecated public void onItemClick(androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder!);
-  }
-
-  public class LeanbackListPreferenceDialogFragmentCompat extends androidx.leanback.preference.LeanbackPreferenceDialogFragmentCompat {
-    ctor public LeanbackListPreferenceDialogFragmentCompat();
-    method public static androidx.leanback.preference.LeanbackListPreferenceDialogFragmentCompat! newInstanceMulti(String!);
-    method public static androidx.leanback.preference.LeanbackListPreferenceDialogFragmentCompat! newInstanceSingle(String!);
-  }
-
-  public static final class LeanbackListPreferenceDialogFragmentCompat.ViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements android.view.View.OnClickListener {
-    method public android.view.ViewGroup! getContainer();
-    method public android.widget.TextView! getTitleView();
-    method public android.widget.Checkable! getWidgetView();
-    method public void onClick(android.view.View!);
-  }
-
-  @Deprecated public class LeanbackPreferenceDialogFragment extends android.app.Fragment {
-    ctor @Deprecated public LeanbackPreferenceDialogFragment();
-    method @Deprecated public androidx.preference.DialogPreference! getPreference();
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    field @Deprecated public static final String ARG_KEY = "key";
-  }
-
-  public class LeanbackPreferenceDialogFragmentCompat extends androidx.fragment.app.Fragment {
-    ctor public LeanbackPreferenceDialogFragmentCompat();
-    method public androidx.preference.DialogPreference! getPreference();
-    field public static final String ARG_KEY = "key";
-  }
-
-  @Deprecated public abstract class LeanbackPreferenceFragment extends androidx.leanback.preference.BaseLeanbackPreferenceFragment {
-    ctor @Deprecated public LeanbackPreferenceFragment();
-    method @Deprecated public void setTitle(CharSequence!);
-  }
-
-  public abstract class LeanbackPreferenceFragmentCompat extends androidx.leanback.preference.BaseLeanbackPreferenceFragmentCompat {
-    ctor public LeanbackPreferenceFragmentCompat();
-    method public void setTitle(CharSequence!);
-  }
-
-  @Deprecated public abstract class LeanbackSettingsFragment extends android.app.Fragment implements androidx.preference.PreferenceFragment.OnPreferenceDisplayDialogCallback androidx.preference.PreferenceFragment.OnPreferenceStartFragmentCallback androidx.preference.PreferenceFragment.OnPreferenceStartScreenCallback {
-    ctor @Deprecated public LeanbackSettingsFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
-    method @Deprecated public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragment, androidx.preference.Preference!);
-    method @Deprecated public abstract void onPreferenceStartInitialScreen();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
-    method @Deprecated public void startImmersiveFragment(android.app.Fragment);
-    method @Deprecated public void startPreferenceFragment(android.app.Fragment);
-  }
-
-  public abstract class LeanbackSettingsFragmentCompat extends androidx.fragment.app.Fragment implements androidx.preference.PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback androidx.preference.PreferenceFragmentCompat.OnPreferenceStartFragmentCallback androidx.preference.PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
-    ctor public LeanbackSettingsFragmentCompat();
-    method public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragmentCompat, androidx.preference.Preference!);
-    method public abstract void onPreferenceStartInitialScreen();
-    method public void startImmersiveFragment(androidx.fragment.app.Fragment);
-    method public void startPreferenceFragment(androidx.fragment.app.Fragment);
-  }
-
-}
-
diff --git a/leanback/leanback-tab/api/public_plus_experimental_1.1.0-beta01.txt b/leanback/leanback-tab/api/public_plus_experimental_1.1.0-beta01.txt
deleted file mode 100644
index 0677db1..0000000
--- a/leanback/leanback-tab/api/public_plus_experimental_1.1.0-beta01.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.tab {
-
-  public class LeanbackTabLayout extends com.google.android.material.tabs.TabLayout {
-    ctor public LeanbackTabLayout(android.content.Context);
-    ctor public LeanbackTabLayout(android.content.Context, android.util.AttributeSet);
-    ctor public LeanbackTabLayout(android.content.Context, android.util.AttributeSet, int);
-  }
-
-  public class LeanbackViewPager extends androidx.viewpager.widget.ViewPager {
-    ctor public LeanbackViewPager(android.content.Context);
-    ctor public LeanbackViewPager(android.content.Context, android.util.AttributeSet?);
-    method public void setKeyEventsEnabled(boolean);
-    method public void setTouchEnabled(boolean);
-  }
-
-}
-
diff --git a/leanback/leanback-tab/api/public_plus_experimental_current.txt b/leanback/leanback-tab/api/public_plus_experimental_current.txt
deleted file mode 100644
index 0677db1..0000000
--- a/leanback/leanback-tab/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.tab {
-
-  public class LeanbackTabLayout extends com.google.android.material.tabs.TabLayout {
-    ctor public LeanbackTabLayout(android.content.Context);
-    ctor public LeanbackTabLayout(android.content.Context, android.util.AttributeSet);
-    ctor public LeanbackTabLayout(android.content.Context, android.util.AttributeSet, int);
-  }
-
-  public class LeanbackViewPager extends androidx.viewpager.widget.ViewPager {
-    ctor public LeanbackViewPager(android.content.Context);
-    ctor public LeanbackViewPager(android.content.Context, android.util.AttributeSet?);
-    method public void setKeyEventsEnabled(boolean);
-    method public void setTouchEnabled(boolean);
-  }
-
-}
-
diff --git a/leanback/leanback/api/public_plus_experimental_current.txt b/leanback/leanback/api/public_plus_experimental_current.txt
deleted file mode 100644
index 91aec39..0000000
--- a/leanback/leanback/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,3066 +0,0 @@
-// Signature format: 4.0
-package androidx.leanback.app {
-
-  public final class BackgroundManager {
-    method public void attach(android.view.Window!);
-    method public void attachToView(android.view.View!);
-    method public void clearDrawable();
-    method @ColorInt public int getColor();
-    method @Deprecated public android.graphics.drawable.Drawable! getDefaultDimLayer();
-    method @Deprecated public android.graphics.drawable.Drawable! getDimLayer();
-    method public android.graphics.drawable.Drawable! getDrawable();
-    method public static androidx.leanback.app.BackgroundManager! getInstance(android.app.Activity!);
-    method public boolean isAttached();
-    method public boolean isAutoReleaseOnStop();
-    method public void release();
-    method public void setAutoReleaseOnStop(boolean);
-    method public void setBitmap(android.graphics.Bitmap!);
-    method public void setColor(@ColorInt int);
-    method @Deprecated public void setDimLayer(android.graphics.drawable.Drawable!);
-    method public void setDrawable(android.graphics.drawable.Drawable!);
-    method public void setThemeDrawableResourceId(int);
-  }
-
-  @Deprecated public class BaseFragment extends androidx.leanback.app.BrandedFragment {
-    method @Deprecated protected Object! createEntranceTransition();
-    method @Deprecated public final androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated protected void onEntranceTransitionEnd();
-    method @Deprecated protected void onEntranceTransitionPrepare();
-    method @Deprecated protected void onEntranceTransitionStart();
-    method @Deprecated public void prepareEntranceTransition();
-    method @Deprecated protected void runEntranceTransition(Object!);
-    method @Deprecated public void startEntranceTransition();
-  }
-
-  public class BaseSupportFragment extends androidx.leanback.app.BrandedSupportFragment {
-    method protected Object! createEntranceTransition();
-    method public final androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method protected void onEntranceTransitionEnd();
-    method protected void onEntranceTransitionPrepare();
-    method protected void onEntranceTransitionStart();
-    method public void prepareEntranceTransition();
-    method protected void runEntranceTransition(Object!);
-    method public void startEntranceTransition();
-  }
-
-  @Deprecated public class BrandedFragment extends android.app.Fragment {
-    ctor @Deprecated public BrandedFragment();
-    method @Deprecated public android.graphics.drawable.Drawable! getBadgeDrawable();
-    method @Deprecated public int getSearchAffordanceColor();
-    method @Deprecated public androidx.leanback.widget.SearchOrbView.Colors! getSearchAffordanceColors();
-    method @Deprecated public CharSequence! getTitle();
-    method @Deprecated public android.view.View! getTitleView();
-    method @Deprecated public androidx.leanback.widget.TitleViewAdapter! getTitleViewAdapter();
-    method @Deprecated public void installTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public final boolean isShowingTitle();
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public android.view.View! onInflateTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
-    method @Deprecated public void setOnSearchClickedListener(android.view.View.OnClickListener!);
-    method @Deprecated public void setSearchAffordanceColor(int);
-    method @Deprecated public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method @Deprecated public void setTitle(CharSequence!);
-    method @Deprecated public void setTitleView(android.view.View!);
-    method @Deprecated public void showTitle(boolean);
-    method @Deprecated public void showTitle(int);
-  }
-
-  public class BrandedSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public BrandedSupportFragment();
-    method public android.graphics.drawable.Drawable? getBadgeDrawable();
-    method public int getSearchAffordanceColor();
-    method public androidx.leanback.widget.SearchOrbView.Colors? getSearchAffordanceColors();
-    method public CharSequence? getTitle();
-    method public android.view.View? getTitleView();
-    method public androidx.leanback.widget.TitleViewAdapter? getTitleViewAdapter();
-    method public void installTitleView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle?);
-    method public final boolean isShowingTitle();
-    method public android.view.View onInflateTitleView(android.view.LayoutInflater, android.view.ViewGroup?, android.os.Bundle?);
-    method public void setBadgeDrawable(android.graphics.drawable.Drawable?);
-    method public void setOnSearchClickedListener(android.view.View.OnClickListener?);
-    method public void setSearchAffordanceColor(int);
-    method public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors);
-    method public void setTitle(CharSequence?);
-    method public void setTitleView(android.view.View?);
-    method public void showTitle(boolean);
-    method public void showTitle(int);
-  }
-
-  @Deprecated public class BrowseFragment extends androidx.leanback.app.BaseFragment {
-    ctor @Deprecated public BrowseFragment();
-    method @Deprecated public static android.os.Bundle! createArgs(android.os.Bundle!, String!, int);
-    method @Deprecated public void enableMainFragmentScaling(boolean);
-    method @Deprecated public void enableRowScaling(boolean);
-    method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated @ColorInt public int getBrandColor();
-    method @Deprecated public androidx.leanback.app.HeadersFragment! getHeadersFragment();
-    method @Deprecated public int getHeadersState();
-    method @Deprecated public android.app.Fragment! getMainFragment();
-    method @Deprecated public final androidx.leanback.app.BrowseFragment.MainFragmentAdapterRegistry! getMainFragmentRegistry();
-    method @Deprecated public androidx.leanback.widget.OnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public androidx.leanback.widget.OnItemViewSelectedListener! getOnItemViewSelectedListener();
-    method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
-    method @Deprecated public int getSelectedPosition();
-    method @Deprecated public androidx.leanback.widget.RowPresenter.ViewHolder! getSelectedRowViewHolder();
-    method @Deprecated public final boolean isHeadersTransitionOnBackEnabled();
-    method @Deprecated public boolean isInHeadersTransition();
-    method @Deprecated public boolean isShowingHeaders();
-    method @Deprecated public androidx.leanback.app.HeadersFragment! onCreateHeadersFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onStop();
-    method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setBrandColor(@ColorInt int);
-    method @Deprecated public void setBrowseTransitionListener(androidx.leanback.app.BrowseFragment.BrowseTransitionListener!);
-    method @Deprecated public void setHeaderPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method @Deprecated public void setHeadersState(int);
-    method @Deprecated public final void setHeadersTransitionOnBackEnabled(boolean);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method @Deprecated public void setSelectedPosition(int);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-    method @Deprecated public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-    method @Deprecated public void startHeadersTransition(boolean);
-    field @Deprecated public static final int HEADERS_DISABLED = 3; // 0x3
-    field @Deprecated public static final int HEADERS_ENABLED = 1; // 0x1
-    field @Deprecated public static final int HEADERS_HIDDEN = 2; // 0x2
-  }
-
-  @Deprecated public static class BrowseFragment.BrowseTransitionListener {
-    ctor @Deprecated public BrowseFragment.BrowseTransitionListener();
-    method @Deprecated public void onHeadersTransitionStart(boolean);
-    method @Deprecated public void onHeadersTransitionStop(boolean);
-  }
-
-  @Deprecated public abstract static class BrowseFragment.FragmentFactory<T extends android.app.Fragment> {
-    ctor @Deprecated public BrowseFragment.FragmentFactory();
-    method @Deprecated public abstract T! createFragment(Object!);
-  }
-
-  @Deprecated public static interface BrowseFragment.FragmentHost {
-    method @Deprecated public void notifyDataReady(androidx.leanback.app.BrowseFragment.MainFragmentAdapter!);
-    method @Deprecated public void notifyViewCreated(androidx.leanback.app.BrowseFragment.MainFragmentAdapter!);
-    method @Deprecated public void showTitleView(boolean);
-  }
-
-  @Deprecated public static class BrowseFragment.ListRowFragmentFactory extends androidx.leanback.app.BrowseFragment.FragmentFactory<androidx.leanback.app.RowsFragment> {
-    ctor @Deprecated public BrowseFragment.ListRowFragmentFactory();
-    method @Deprecated public androidx.leanback.app.RowsFragment! createFragment(Object!);
-  }
-
-  @Deprecated public static class BrowseFragment.MainFragmentAdapter<T extends android.app.Fragment> {
-    ctor @Deprecated public BrowseFragment.MainFragmentAdapter(T!);
-    method @Deprecated public final T! getFragment();
-    method @Deprecated public final androidx.leanback.app.BrowseFragment.FragmentHost! getFragmentHost();
-    method @Deprecated public boolean isScalingEnabled();
-    method @Deprecated public boolean isScrolling();
-    method @Deprecated public void onTransitionEnd();
-    method @Deprecated public boolean onTransitionPrepare();
-    method @Deprecated public void onTransitionStart();
-    method @Deprecated public void setAlignment(int);
-    method @Deprecated public void setEntranceTransitionState(boolean);
-    method @Deprecated public void setExpand(boolean);
-    method @Deprecated public void setScalingEnabled(boolean);
-  }
-
-  @Deprecated public static interface BrowseFragment.MainFragmentAdapterProvider {
-    method @Deprecated public androidx.leanback.app.BrowseFragment.MainFragmentAdapter! getMainFragmentAdapter();
-  }
-
-  @Deprecated public static final class BrowseFragment.MainFragmentAdapterRegistry {
-    ctor @Deprecated public BrowseFragment.MainFragmentAdapterRegistry();
-    method @Deprecated public android.app.Fragment! createFragment(Object!);
-    method @Deprecated public void registerFragment(Class<?>!, androidx.leanback.app.BrowseFragment.FragmentFactory!);
-  }
-
-  @Deprecated public static class BrowseFragment.MainFragmentRowsAdapter<T extends android.app.Fragment> {
-    ctor @Deprecated public BrowseFragment.MainFragmentRowsAdapter(T!);
-    method @Deprecated public androidx.leanback.widget.RowPresenter.ViewHolder! findRowViewHolderByPosition(int);
-    method @Deprecated public final T! getFragment();
-    method @Deprecated public int getSelectedPosition();
-    method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-    method @Deprecated public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-  }
-
-  @Deprecated public static interface BrowseFragment.MainFragmentRowsAdapterProvider {
-    method @Deprecated public androidx.leanback.app.BrowseFragment.MainFragmentRowsAdapter! getMainFragmentRowsAdapter();
-  }
-
-  public class BrowseSupportFragment extends androidx.leanback.app.BaseSupportFragment {
-    ctor public BrowseSupportFragment();
-    method public static android.os.Bundle! createArgs(android.os.Bundle!, String!, int);
-    method public void enableMainFragmentScaling(boolean);
-    method @Deprecated public void enableRowScaling(boolean);
-    method public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @ColorInt public int getBrandColor();
-    method public int getHeadersState();
-    method public androidx.leanback.app.HeadersSupportFragment! getHeadersSupportFragment();
-    method public androidx.fragment.app.Fragment! getMainFragment();
-    method public final androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapterRegistry! getMainFragmentRegistry();
-    method public androidx.leanback.widget.OnItemViewClickedListener! getOnItemViewClickedListener();
-    method public androidx.leanback.widget.OnItemViewSelectedListener! getOnItemViewSelectedListener();
-    method public androidx.leanback.app.RowsSupportFragment! getRowsSupportFragment();
-    method public int getSelectedPosition();
-    method public androidx.leanback.widget.RowPresenter.ViewHolder! getSelectedRowViewHolder();
-    method public final boolean isHeadersTransitionOnBackEnabled();
-    method public boolean isInHeadersTransition();
-    method public boolean isShowingHeaders();
-    method public androidx.leanback.app.HeadersSupportFragment! onCreateHeadersSupportFragment();
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setBrandColor(@ColorInt int);
-    method public void setBrowseTransitionListener(androidx.leanback.app.BrowseSupportFragment.BrowseTransitionListener!);
-    method public void setHeaderPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method public void setHeadersState(int);
-    method public final void setHeadersTransitionOnBackEnabled(boolean);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, boolean);
-    method public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-    method public void startHeadersTransition(boolean);
-    field public static final int HEADERS_DISABLED = 3; // 0x3
-    field public static final int HEADERS_ENABLED = 1; // 0x1
-    field public static final int HEADERS_HIDDEN = 2; // 0x2
-  }
-
-  public static class BrowseSupportFragment.BrowseTransitionListener {
-    ctor public BrowseSupportFragment.BrowseTransitionListener();
-    method public void onHeadersTransitionStart(boolean);
-    method public void onHeadersTransitionStop(boolean);
-  }
-
-  public abstract static class BrowseSupportFragment.FragmentFactory<T extends androidx.fragment.app.Fragment> {
-    ctor public BrowseSupportFragment.FragmentFactory();
-    method public abstract T! createFragment(Object!);
-  }
-
-  public static interface BrowseSupportFragment.FragmentHost {
-    method public void notifyDataReady(androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapter!);
-    method public void notifyViewCreated(androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapter!);
-    method public void showTitleView(boolean);
-  }
-
-  public static class BrowseSupportFragment.ListRowFragmentFactory extends androidx.leanback.app.BrowseSupportFragment.FragmentFactory<androidx.leanback.app.RowsSupportFragment> {
-    ctor public BrowseSupportFragment.ListRowFragmentFactory();
-    method public androidx.leanback.app.RowsSupportFragment! createFragment(Object!);
-  }
-
-  public static class BrowseSupportFragment.MainFragmentAdapter<T extends androidx.fragment.app.Fragment> {
-    ctor public BrowseSupportFragment.MainFragmentAdapter(T!);
-    method public final T! getFragment();
-    method public final androidx.leanback.app.BrowseSupportFragment.FragmentHost! getFragmentHost();
-    method public boolean isScalingEnabled();
-    method public boolean isScrolling();
-    method public void onTransitionEnd();
-    method public boolean onTransitionPrepare();
-    method public void onTransitionStart();
-    method public void setAlignment(int);
-    method public void setEntranceTransitionState(boolean);
-    method public void setExpand(boolean);
-    method public void setScalingEnabled(boolean);
-  }
-
-  public static interface BrowseSupportFragment.MainFragmentAdapterProvider {
-    method public androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapter! getMainFragmentAdapter();
-  }
-
-  public static final class BrowseSupportFragment.MainFragmentAdapterRegistry {
-    ctor public BrowseSupportFragment.MainFragmentAdapterRegistry();
-    method public androidx.fragment.app.Fragment! createFragment(Object!);
-    method public void registerFragment(Class<?>!, androidx.leanback.app.BrowseSupportFragment.FragmentFactory!);
-  }
-
-  public static class BrowseSupportFragment.MainFragmentRowsAdapter<T extends androidx.fragment.app.Fragment> {
-    ctor public BrowseSupportFragment.MainFragmentRowsAdapter(T!);
-    method public androidx.leanback.widget.RowPresenter.ViewHolder! findRowViewHolderByPosition(int);
-    method public final T! getFragment();
-    method public int getSelectedPosition();
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method public void setSelectedPosition(int, boolean);
-    method public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-  }
-
-  public static interface BrowseSupportFragment.MainFragmentRowsAdapterProvider {
-    method public androidx.leanback.app.BrowseSupportFragment.MainFragmentRowsAdapter! getMainFragmentRowsAdapter();
-  }
-
-  @Deprecated public class DetailsFragment extends androidx.leanback.app.BaseFragment {
-    ctor @Deprecated public DetailsFragment();
-    method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated public androidx.leanback.widget.BaseOnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public androidx.leanback.widget.DetailsParallax! getParallax();
-    method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
-    method @Deprecated protected android.view.View! inflateTitle(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 protected void onSetDetailsOverviewRowStatus(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, int, int);
-    method @Deprecated protected void onSetRowStatus(androidx.leanback.widget.RowPresenter!, androidx.leanback.widget.RowPresenter.ViewHolder!, int, int, int);
-    method @Deprecated public void onStop();
-    method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method @Deprecated public void setSelectedPosition(int);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-    method @Deprecated protected void setupDetailsOverviewRowPresenter(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!);
-    method @Deprecated protected void setupPresenter(androidx.leanback.widget.Presenter!);
-  }
-
-  @Deprecated public class DetailsFragmentBackgroundController {
-    ctor @Deprecated public DetailsFragmentBackgroundController(androidx.leanback.app.DetailsFragment!);
-    method @Deprecated public boolean canNavigateToVideoFragment();
-    method @Deprecated public void enableParallax();
-    method @Deprecated public void enableParallax(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, androidx.leanback.widget.ParallaxTarget.PropertyValuesHolderTarget?);
-    method @Deprecated public final android.app.Fragment! findOrCreateVideoFragment();
-    method @Deprecated public final android.graphics.drawable.Drawable! getBottomDrawable();
-    method @Deprecated public final android.graphics.Bitmap! getCoverBitmap();
-    method @Deprecated public final android.graphics.drawable.Drawable! getCoverDrawable();
-    method @Deprecated public final int getParallaxDrawableMaxOffset();
-    method @Deprecated public final androidx.leanback.media.PlaybackGlue! getPlaybackGlue();
-    method @Deprecated @ColorInt public final int getSolidColor();
-    method @Deprecated public androidx.leanback.media.PlaybackGlueHost! onCreateGlueHost();
-    method @Deprecated public android.app.Fragment! onCreateVideoFragment();
-    method @Deprecated public final void setCoverBitmap(android.graphics.Bitmap!);
-    method @Deprecated public final void setParallaxDrawableMaxOffset(int);
-    method @Deprecated public final void setSolidColor(@ColorInt int);
-    method @Deprecated public void setupVideoPlayback(androidx.leanback.media.PlaybackGlue);
-    method @Deprecated public final void switchToRows();
-    method @Deprecated public final void switchToVideo();
-  }
-
-  public class DetailsSupportFragment extends androidx.leanback.app.BaseSupportFragment {
-    ctor public DetailsSupportFragment();
-    method public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method public androidx.leanback.widget.BaseOnItemViewClickedListener! getOnItemViewClickedListener();
-    method public androidx.leanback.widget.DetailsParallax! getParallax();
-    method public androidx.leanback.app.RowsSupportFragment! getRowsSupportFragment();
-    method @Deprecated protected android.view.View! inflateTitle(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method protected void onSetDetailsOverviewRowStatus(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, int, int);
-    method protected void onSetRowStatus(androidx.leanback.widget.RowPresenter!, androidx.leanback.widget.RowPresenter.ViewHolder!, int, int, int);
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, boolean);
-    method protected void setupDetailsOverviewRowPresenter(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!);
-    method protected void setupPresenter(androidx.leanback.widget.Presenter!);
-  }
-
-  public class DetailsSupportFragmentBackgroundController {
-    ctor public DetailsSupportFragmentBackgroundController(androidx.leanback.app.DetailsSupportFragment!);
-    method public boolean canNavigateToVideoSupportFragment();
-    method public void enableParallax();
-    method public void enableParallax(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, androidx.leanback.widget.ParallaxTarget.PropertyValuesHolderTarget?);
-    method public final androidx.fragment.app.Fragment! findOrCreateVideoSupportFragment();
-    method public final android.graphics.drawable.Drawable! getBottomDrawable();
-    method public final android.graphics.Bitmap! getCoverBitmap();
-    method public final android.graphics.drawable.Drawable! getCoverDrawable();
-    method public final int getParallaxDrawableMaxOffset();
-    method public final androidx.leanback.media.PlaybackGlue! getPlaybackGlue();
-    method @ColorInt public final int getSolidColor();
-    method public androidx.leanback.media.PlaybackGlueHost! onCreateGlueHost();
-    method public androidx.fragment.app.Fragment! onCreateVideoSupportFragment();
-    method public final void setCoverBitmap(android.graphics.Bitmap!);
-    method public final void setParallaxDrawableMaxOffset(int);
-    method public final void setSolidColor(@ColorInt int);
-    method public void setupVideoPlayback(androidx.leanback.media.PlaybackGlue);
-    method public final void switchToRows();
-    method public final void switchToVideo();
-  }
-
-  @Deprecated public class ErrorFragment extends androidx.leanback.app.BrandedFragment {
-    ctor @Deprecated public ErrorFragment();
-    method @Deprecated public android.graphics.drawable.Drawable! getBackgroundDrawable();
-    method @Deprecated public android.view.View.OnClickListener! getButtonClickListener();
-    method @Deprecated public String! getButtonText();
-    method @Deprecated public android.graphics.drawable.Drawable! getImageDrawable();
-    method @Deprecated public CharSequence! getMessage();
-    method @Deprecated public boolean isBackgroundTranslucent();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void setBackgroundDrawable(android.graphics.drawable.Drawable!);
-    method @Deprecated public void setButtonClickListener(android.view.View.OnClickListener!);
-    method @Deprecated public void setButtonText(String!);
-    method @Deprecated public void setDefaultBackground(boolean);
-    method @Deprecated public void setImageDrawable(android.graphics.drawable.Drawable!);
-    method @Deprecated public void setMessage(CharSequence!);
-  }
-
-  public class ErrorSupportFragment extends androidx.leanback.app.BrandedSupportFragment {
-    ctor public ErrorSupportFragment();
-    method public android.graphics.drawable.Drawable? getBackgroundDrawable();
-    method public android.view.View.OnClickListener? getButtonClickListener();
-    method public String? getButtonText();
-    method public android.graphics.drawable.Drawable? getImageDrawable();
-    method public CharSequence? getMessage();
-    method public boolean isBackgroundTranslucent();
-    method public void setBackgroundDrawable(android.graphics.drawable.Drawable?);
-    method public void setButtonClickListener(android.view.View.OnClickListener?);
-    method public void setButtonText(String?);
-    method public void setDefaultBackground(boolean);
-    method public void setImageDrawable(android.graphics.drawable.Drawable?);
-    method public void setMessage(CharSequence?);
-  }
-
-  @Deprecated public class GuidedStepFragment extends android.app.Fragment {
-    ctor @Deprecated public GuidedStepFragment();
-    method @Deprecated public static int add(android.app.FragmentManager!, androidx.leanback.app.GuidedStepFragment!);
-    method @Deprecated public static int add(android.app.FragmentManager!, androidx.leanback.app.GuidedStepFragment!, int);
-    method @Deprecated public static int addAsRoot(android.app.Activity!, androidx.leanback.app.GuidedStepFragment!, int);
-    method @Deprecated public void collapseAction(boolean);
-    method @Deprecated public void collapseSubActions();
-    method @Deprecated public void expandAction(androidx.leanback.widget.GuidedAction!, boolean);
-    method @Deprecated public void expandSubActions(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public androidx.leanback.widget.GuidedAction! findActionById(long);
-    method @Deprecated public int findActionPositionById(long);
-    method @Deprecated public androidx.leanback.widget.GuidedAction! findButtonActionById(long);
-    method @Deprecated public int findButtonActionPositionById(long);
-    method @Deprecated public void finishGuidedStepFragments();
-    method @Deprecated public android.view.View! getActionItemView(int);
-    method @Deprecated public java.util.List<androidx.leanback.widget.GuidedAction!>! getActions();
-    method @Deprecated public android.view.View! getButtonActionItemView(int);
-    method @Deprecated public java.util.List<androidx.leanback.widget.GuidedAction!>! getButtonActions();
-    method @Deprecated public static androidx.leanback.app.GuidedStepFragment! getCurrentGuidedStepFragment(android.app.FragmentManager!);
-    method @Deprecated public androidx.leanback.widget.GuidanceStylist! getGuidanceStylist();
-    method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! getGuidedActionsStylist();
-    method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! getGuidedButtonActionsStylist();
-    method @Deprecated public int getSelectedActionPosition();
-    method @Deprecated public int getSelectedButtonActionPosition();
-    method @Deprecated public int getUiStyle();
-    method @Deprecated public boolean isExpanded();
-    method @Deprecated public boolean isFocusOutEndAllowed();
-    method @Deprecated public boolean isFocusOutStartAllowed();
-    method @Deprecated public boolean isSubActionsExpanded();
-    method @Deprecated public void notifyActionChanged(int);
-    method @Deprecated public void notifyButtonActionChanged(int);
-    method @Deprecated protected void onAddSharedElementTransition(android.app.FragmentTransaction!, androidx.leanback.app.GuidedStepFragment!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public void onCreateActions(java.util.List<androidx.leanback.widget.GuidedAction!>, android.os.Bundle!);
-    method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateActionsStylist();
-    method @Deprecated public android.view.View! onCreateBackgroundView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onCreateButtonActions(java.util.List<androidx.leanback.widget.GuidedAction!>, android.os.Bundle!);
-    method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateButtonActionsStylist();
-    method @Deprecated public androidx.leanback.widget.GuidanceStylist.Guidance onCreateGuidance(android.os.Bundle!);
-    method @Deprecated public androidx.leanback.widget.GuidanceStylist! onCreateGuidanceStylist();
-    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 onGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public void onGuidedActionEditCanceled(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public void onGuidedActionEdited(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public long onGuidedActionEditedAndProceed(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public void onGuidedActionFocused(androidx.leanback.widget.GuidedAction);
-    method @Deprecated protected void onProvideFragmentTransitions();
-    method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public boolean onSubGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public void openInEditMode(androidx.leanback.widget.GuidedAction!);
-    method @Deprecated public void popBackStackToGuidedStepFragment(Class<?>!, int);
-    method @Deprecated public void setActions(java.util.List<androidx.leanback.widget.GuidedAction!>!);
-    method @Deprecated public void setActionsDiffCallback(androidx.leanback.widget.DiffCallback<androidx.leanback.widget.GuidedAction!>!);
-    method @Deprecated public void setButtonActions(java.util.List<androidx.leanback.widget.GuidedAction!>!);
-    method @Deprecated public void setSelectedActionPosition(int);
-    method @Deprecated public void setSelectedButtonActionPosition(int);
-    method @Deprecated public void setUiStyle(int);
-    field @Deprecated public static final String EXTRA_UI_STYLE = "uiStyle";
-    field @Deprecated public static final int UI_STYLE_ACTIVITY_ROOT = 2; // 0x2
-    field @Deprecated public static final int UI_STYLE_DEFAULT = 0; // 0x0
-    field @Deprecated public static final int UI_STYLE_ENTRANCE = 1; // 0x1
-    field @Deprecated public static final int UI_STYLE_REPLACE = 0; // 0x0
-  }
-
-  public class GuidedStepSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public GuidedStepSupportFragment();
-    method public static int add(androidx.fragment.app.FragmentManager, androidx.leanback.app.GuidedStepSupportFragment);
-    method public static int add(androidx.fragment.app.FragmentManager, androidx.leanback.app.GuidedStepSupportFragment, int);
-    method public static int addAsRoot(androidx.fragment.app.FragmentActivity, androidx.leanback.app.GuidedStepSupportFragment, int);
-    method public void collapseAction(boolean);
-    method public void collapseSubActions();
-    method public void expandAction(androidx.leanback.widget.GuidedAction, boolean);
-    method public void expandSubActions(androidx.leanback.widget.GuidedAction);
-    method public androidx.leanback.widget.GuidedAction? findActionById(long);
-    method public int findActionPositionById(long);
-    method public androidx.leanback.widget.GuidedAction? findButtonActionById(long);
-    method public int findButtonActionPositionById(long);
-    method public void finishGuidedStepSupportFragments();
-    method public android.view.View? getActionItemView(int);
-    method public java.util.List<androidx.leanback.widget.GuidedAction!> getActions();
-    method public android.view.View? getButtonActionItemView(int);
-    method public java.util.List<androidx.leanback.widget.GuidedAction!> getButtonActions();
-    method public static androidx.leanback.app.GuidedStepSupportFragment? getCurrentGuidedStepSupportFragment(androidx.fragment.app.FragmentManager);
-    method public androidx.leanback.widget.GuidanceStylist getGuidanceStylist();
-    method public androidx.leanback.widget.GuidedActionsStylist getGuidedActionsStylist();
-    method public androidx.leanback.widget.GuidedActionsStylist getGuidedButtonActionsStylist();
-    method public int getSelectedActionPosition();
-    method public int getSelectedButtonActionPosition();
-    method public int getUiStyle();
-    method public boolean isExpanded();
-    method public boolean isFocusOutEndAllowed();
-    method public boolean isFocusOutStartAllowed();
-    method public boolean isSubActionsExpanded();
-    method public void notifyActionChanged(int);
-    method public void notifyButtonActionChanged(int);
-    method protected void onAddSharedElementTransition(androidx.fragment.app.FragmentTransaction, androidx.leanback.app.GuidedStepSupportFragment);
-    method public void onCreateActions(java.util.List<androidx.leanback.widget.GuidedAction!>, android.os.Bundle?);
-    method public androidx.leanback.widget.GuidedActionsStylist onCreateActionsStylist();
-    method public android.view.View? onCreateBackgroundView(android.view.LayoutInflater, android.view.ViewGroup?, android.os.Bundle?);
-    method public void onCreateButtonActions(java.util.List<androidx.leanback.widget.GuidedAction!>, android.os.Bundle?);
-    method public androidx.leanback.widget.GuidedActionsStylist onCreateButtonActionsStylist();
-    method public androidx.leanback.widget.GuidanceStylist.Guidance onCreateGuidance(android.os.Bundle?);
-    method public androidx.leanback.widget.GuidanceStylist onCreateGuidanceStylist();
-    method public void onGuidedActionClicked(androidx.leanback.widget.GuidedAction);
-    method public void onGuidedActionEditCanceled(androidx.leanback.widget.GuidedAction);
-    method @Deprecated public void onGuidedActionEdited(androidx.leanback.widget.GuidedAction!);
-    method public long onGuidedActionEditedAndProceed(androidx.leanback.widget.GuidedAction);
-    method public void onGuidedActionFocused(androidx.leanback.widget.GuidedAction);
-    method protected void onProvideFragmentTransitions();
-    method public int onProvideTheme();
-    method public boolean onSubGuidedActionClicked(androidx.leanback.widget.GuidedAction);
-    method public void openInEditMode(androidx.leanback.widget.GuidedAction?);
-    method public void popBackStackToGuidedStepSupportFragment(Class<?>, int);
-    method public void setActions(java.util.List<androidx.leanback.widget.GuidedAction!>);
-    method public void setActionsDiffCallback(androidx.leanback.widget.DiffCallback<androidx.leanback.widget.GuidedAction!>?);
-    method public void setButtonActions(java.util.List<androidx.leanback.widget.GuidedAction!>);
-    method public void setSelectedActionPosition(int);
-    method public void setSelectedButtonActionPosition(int);
-    method public void setUiStyle(int);
-    field public static final String EXTRA_UI_STYLE = "uiStyle";
-    field public static final int UI_STYLE_ACTIVITY_ROOT = 2; // 0x2
-    field @Deprecated public static final int UI_STYLE_DEFAULT = 0; // 0x0
-    field public static final int UI_STYLE_ENTRANCE = 1; // 0x1
-    field public static final int UI_STYLE_REPLACE = 0; // 0x0
-  }
-
-  @Deprecated public class HeadersFragment extends android.app.Fragment {
-    ctor @Deprecated public HeadersFragment();
-    method @Deprecated public final androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated public final androidx.leanback.widget.ItemBridgeAdapter! getBridgeAdapter();
-    method @Deprecated public final androidx.leanback.widget.PresenterSelector! getPresenterSelector();
-    method @Deprecated public int getSelectedPosition();
-    method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
-    method @Deprecated public boolean isScrolling();
-    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 onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onTransitionEnd();
-    method @Deprecated public boolean onTransitionPrepare();
-    method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setAlignment(int);
-    method @Deprecated public void setOnHeaderClickedListener(androidx.leanback.app.HeadersFragment.OnHeaderClickedListener!);
-    method @Deprecated public void setOnHeaderViewSelectedListener(androidx.leanback.app.HeadersFragment.OnHeaderViewSelectedListener!);
-    method @Deprecated public final void setPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method @Deprecated public void setSelectedPosition(int);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-  }
-
-  @Deprecated public static interface HeadersFragment.OnHeaderClickedListener {
-    method @Deprecated public void onHeaderClicked(androidx.leanback.widget.RowHeaderPresenter.ViewHolder!, androidx.leanback.widget.Row!);
-  }
-
-  @Deprecated public static interface HeadersFragment.OnHeaderViewSelectedListener {
-    method @Deprecated public void onHeaderSelected(androidx.leanback.widget.RowHeaderPresenter.ViewHolder!, androidx.leanback.widget.Row!);
-  }
-
-  public class HeadersSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public HeadersSupportFragment();
-    method public final androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method public final androidx.leanback.widget.ItemBridgeAdapter! getBridgeAdapter();
-    method public final androidx.leanback.widget.PresenterSelector! getPresenterSelector();
-    method public int getSelectedPosition();
-    method public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
-    method public boolean isScrolling();
-    method public void onTransitionEnd();
-    method public boolean onTransitionPrepare();
-    method public void onTransitionStart();
-    method public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setAlignment(int);
-    method public void setOnHeaderClickedListener(androidx.leanback.app.HeadersSupportFragment.OnHeaderClickedListener!);
-    method public void setOnHeaderViewSelectedListener(androidx.leanback.app.HeadersSupportFragment.OnHeaderViewSelectedListener!);
-    method public final void setPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, boolean);
-  }
-
-  public static interface HeadersSupportFragment.OnHeaderClickedListener {
-    method public void onHeaderClicked(androidx.leanback.widget.RowHeaderPresenter.ViewHolder!, androidx.leanback.widget.Row!);
-  }
-
-  public static interface HeadersSupportFragment.OnHeaderViewSelectedListener {
-    method public void onHeaderSelected(androidx.leanback.widget.RowHeaderPresenter.ViewHolder!, androidx.leanback.widget.Row!);
-  }
-
-  @Deprecated public abstract class OnboardingFragment extends android.app.Fragment {
-    ctor @Deprecated public OnboardingFragment();
-    method @Deprecated @ColorInt public final int getArrowBackgroundColor();
-    method @Deprecated @ColorInt public final int getArrowColor();
-    method @Deprecated protected final int getCurrentPageIndex();
-    method @Deprecated @ColorInt public final int getDescriptionViewTextColor();
-    method @Deprecated @ColorInt public final int getDotBackgroundColor();
-    method @Deprecated public final int getIconResourceId();
-    method @Deprecated public final int getLogoResourceId();
-    method @Deprecated protected abstract int getPageCount();
-    method @Deprecated protected abstract CharSequence! getPageDescription(int);
-    method @Deprecated protected abstract CharSequence! getPageTitle(int);
-    method @Deprecated public final CharSequence! getStartButtonText();
-    method @Deprecated @ColorInt public final int getTitleViewTextColor();
-    method @Deprecated protected final boolean isLogoAnimationFinished();
-    method @Deprecated protected void moveToNextPage();
-    method @Deprecated protected void moveToPreviousPage();
-    method @Deprecated protected abstract android.view.View? onCreateBackgroundView(android.view.LayoutInflater!, android.view.ViewGroup!);
-    method @Deprecated protected abstract android.view.View? onCreateContentView(android.view.LayoutInflater!, android.view.ViewGroup!);
-    method @Deprecated protected android.animation.Animator! onCreateDescriptionAnimator();
-    method @Deprecated protected android.animation.Animator? onCreateEnterAnimation();
-    method @Deprecated protected abstract android.view.View? onCreateForegroundView(android.view.LayoutInflater!, android.view.ViewGroup!);
-    method @Deprecated protected android.animation.Animator? onCreateLogoAnimation();
-    method @Deprecated protected android.animation.Animator! onCreateTitleAnimator();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated protected void onFinishFragment();
-    method @Deprecated protected void onLogoAnimationFinished();
-    method @Deprecated protected void onPageChanged(int, int);
-    method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public void setArrowBackgroundColor(@ColorInt int);
-    method @Deprecated public void setArrowColor(@ColorInt int);
-    method @Deprecated public void setDescriptionViewTextColor(@ColorInt int);
-    method @Deprecated public void setDotBackgroundColor(@ColorInt int);
-    method @Deprecated public final void setIconResouceId(int);
-    method @Deprecated public final void setLogoResourceId(int);
-    method @Deprecated public void setStartButtonText(CharSequence!);
-    method @Deprecated public void setTitleViewTextColor(@ColorInt int);
-    method @Deprecated protected final void startEnterAnimation(boolean);
-  }
-
-  public abstract class OnboardingSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public OnboardingSupportFragment();
-    method @ColorInt public final int getArrowBackgroundColor();
-    method @ColorInt public final int getArrowColor();
-    method protected final int getCurrentPageIndex();
-    method @ColorInt public final int getDescriptionViewTextColor();
-    method @ColorInt public final int getDotBackgroundColor();
-    method public final int getIconResourceId();
-    method public final int getLogoResourceId();
-    method protected abstract int getPageCount();
-    method protected abstract CharSequence? getPageDescription(int);
-    method protected abstract CharSequence? getPageTitle(int);
-    method public final CharSequence? getStartButtonText();
-    method @ColorInt public final int getTitleViewTextColor();
-    method protected final boolean isLogoAnimationFinished();
-    method protected void moveToNextPage();
-    method protected void moveToPreviousPage();
-    method protected abstract android.view.View? onCreateBackgroundView(android.view.LayoutInflater, android.view.ViewGroup);
-    method protected abstract android.view.View? onCreateContentView(android.view.LayoutInflater, android.view.ViewGroup);
-    method protected android.animation.Animator onCreateDescriptionAnimator();
-    method protected android.animation.Animator? onCreateEnterAnimation();
-    method protected abstract android.view.View? onCreateForegroundView(android.view.LayoutInflater, android.view.ViewGroup);
-    method protected android.animation.Animator? onCreateLogoAnimation();
-    method protected android.animation.Animator onCreateTitleAnimator();
-    method protected void onFinishFragment();
-    method protected void onLogoAnimationFinished();
-    method protected void onPageChanged(int, int);
-    method public int onProvideTheme();
-    method public void setArrowBackgroundColor(@ColorInt int);
-    method public void setArrowColor(@ColorInt int);
-    method public void setDescriptionViewTextColor(@ColorInt int);
-    method public void setDotBackgroundColor(@ColorInt int);
-    method public final void setIconResouceId(int);
-    method public final void setLogoResourceId(int);
-    method public void setStartButtonText(CharSequence?);
-    method public void setTitleViewTextColor(@ColorInt int);
-    method protected final void startEnterAnimation(boolean);
-  }
-
-  @Deprecated public class PlaybackFragment extends android.app.Fragment {
-    ctor @Deprecated public PlaybackFragment();
-    method @Deprecated public void fadeOut();
-    method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated public int getBackgroundType();
-    method @Deprecated public androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method @Deprecated public void hideControlsOverlay(boolean);
-    method @Deprecated public boolean isControlsOverlayAutoHideEnabled();
-    method @Deprecated public boolean isControlsOverlayVisible();
-    method @Deprecated public boolean isFadingEnabled();
-    method @Deprecated public boolean isShowOrHideControlsOverlayOnUserInteraction();
-    method @Deprecated public void notifyPlaybackRowChanged();
-    method @Deprecated protected void onBufferingStateChanged(boolean);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onDestroyView();
-    method @Deprecated protected void onError(int, CharSequence!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
-    method @Deprecated protected void onVideoSizeChanged(int, int);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setBackgroundType(int);
-    method @Deprecated public void setControlsOverlayAutoHideEnabled(boolean);
-    method @Deprecated public void setFadingEnabled(boolean);
-    method @Deprecated public void setHostCallback(androidx.leanback.media.PlaybackGlueHost.HostCallback!);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method @Deprecated public final void setOnKeyInterceptListener(android.view.View.OnKeyListener!);
-    method @Deprecated public void setOnPlaybackItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method @Deprecated public void setPlaybackRow(androidx.leanback.widget.Row!);
-    method @Deprecated public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
-    method @Deprecated public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-    method @Deprecated public void setSelectedPosition(int);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-    method @Deprecated public void setShowOrHideControlsOverlayOnUserInteraction(boolean);
-    method @Deprecated public void showControlsOverlay(boolean);
-    method @Deprecated public void tickle();
-    field @Deprecated public static final int BG_DARK = 1; // 0x1
-    field @Deprecated public static final int BG_LIGHT = 2; // 0x2
-    field @Deprecated public static final int BG_NONE = 0; // 0x0
-  }
-
-  @Deprecated public class PlaybackFragmentGlueHost extends androidx.leanback.media.PlaybackGlueHost implements androidx.leanback.widget.PlaybackSeekUi {
-    ctor @Deprecated public PlaybackFragmentGlueHost(androidx.leanback.app.PlaybackFragment!);
-    method @Deprecated public void fadeOut();
-    method @Deprecated public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-  }
-
-  public class PlaybackSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public PlaybackSupportFragment();
-    method @Deprecated public void fadeOut();
-    method public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method public int getBackgroundType();
-    method public androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method public void hideControlsOverlay(boolean);
-    method public boolean isControlsOverlayAutoHideEnabled();
-    method public boolean isControlsOverlayVisible();
-    method @Deprecated public boolean isFadingEnabled();
-    method public boolean isShowOrHideControlsOverlayOnUserInteraction();
-    method public void notifyPlaybackRowChanged();
-    method protected void onBufferingStateChanged(boolean);
-    method protected void onError(int, CharSequence!);
-    method protected void onVideoSizeChanged(int, int);
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setBackgroundType(int);
-    method public void setControlsOverlayAutoHideEnabled(boolean);
-    method @Deprecated public void setFadingEnabled(boolean);
-    method public void setHostCallback(androidx.leanback.media.PlaybackGlueHost.HostCallback!);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method public final void setOnKeyInterceptListener(android.view.View.OnKeyListener!);
-    method public void setOnPlaybackItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method public void setPlaybackRow(androidx.leanback.widget.Row!);
-    method public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
-    method public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, boolean);
-    method public void setShowOrHideControlsOverlayOnUserInteraction(boolean);
-    method public void showControlsOverlay(boolean);
-    method public void tickle();
-    field public static final int BG_DARK = 1; // 0x1
-    field public static final int BG_LIGHT = 2; // 0x2
-    field public static final int BG_NONE = 0; // 0x0
-  }
-
-  public class PlaybackSupportFragmentGlueHost extends androidx.leanback.media.PlaybackGlueHost implements androidx.leanback.widget.PlaybackSeekUi {
-    ctor public PlaybackSupportFragmentGlueHost(androidx.leanback.app.PlaybackSupportFragment!);
-    method public void fadeOut();
-    method public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-  }
-
-  public final class ProgressBarManager {
-    ctor public ProgressBarManager();
-    method public void disableProgressBar();
-    method public void enableProgressBar();
-    method public long getInitialDelay();
-    method public void hide();
-    method public void setInitialDelay(long);
-    method public void setProgressBarView(android.view.View!);
-    method public void setRootView(android.view.ViewGroup!);
-    method public void show();
-  }
-
-  @Deprecated public class RowsFragment extends android.app.Fragment implements androidx.leanback.app.BrowseFragment.MainFragmentAdapterProvider androidx.leanback.app.BrowseFragment.MainFragmentRowsAdapterProvider {
-    ctor @Deprecated public RowsFragment();
-    method @Deprecated public void enableRowScaling(boolean);
-    method @Deprecated protected androidx.leanback.widget.VerticalGridView! findGridViewFromRoot(android.view.View!);
-    method @Deprecated public androidx.leanback.widget.RowPresenter.ViewHolder! findRowViewHolderByPosition(int);
-    method @Deprecated public final androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated public final androidx.leanback.widget.ItemBridgeAdapter! getBridgeAdapter();
-    method @Deprecated public androidx.leanback.app.BrowseFragment.MainFragmentAdapter! getMainFragmentAdapter();
-    method @Deprecated public androidx.leanback.app.BrowseFragment.MainFragmentRowsAdapter! getMainFragmentRowsAdapter();
-    method @Deprecated public androidx.leanback.widget.BaseOnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public androidx.leanback.widget.BaseOnItemViewSelectedListener! getOnItemViewSelectedListener();
-    method @Deprecated public final androidx.leanback.widget.PresenterSelector! getPresenterSelector();
-    method @Deprecated public androidx.leanback.widget.RowPresenter.ViewHolder! getRowViewHolder(int);
-    method @Deprecated public int getSelectedPosition();
-    method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
-    method @Deprecated public boolean isScrolling();
-    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 onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onTransitionEnd();
-    method @Deprecated public boolean onTransitionPrepare();
-    method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
-    method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setAlignment(int);
-    method @Deprecated public void setEntranceTransitionState(boolean);
-    method @Deprecated public void setExpand(boolean);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method @Deprecated public final void setPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method @Deprecated public void setSelectedPosition(int);
-    method @Deprecated public void setSelectedPosition(int, boolean);
-    method @Deprecated public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-  }
-
-  @Deprecated public static class RowsFragment.MainFragmentAdapter extends androidx.leanback.app.BrowseFragment.MainFragmentAdapter<androidx.leanback.app.RowsFragment> {
-    ctor @Deprecated public RowsFragment.MainFragmentAdapter(androidx.leanback.app.RowsFragment!);
-  }
-
-  @Deprecated public static class RowsFragment.MainFragmentRowsAdapter extends androidx.leanback.app.BrowseFragment.MainFragmentRowsAdapter<androidx.leanback.app.RowsFragment> {
-    ctor @Deprecated public RowsFragment.MainFragmentRowsAdapter(androidx.leanback.app.RowsFragment!);
-  }
-
-  public class RowsSupportFragment extends androidx.fragment.app.Fragment implements androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapterProvider androidx.leanback.app.BrowseSupportFragment.MainFragmentRowsAdapterProvider {
-    ctor public RowsSupportFragment();
-    method @Deprecated public void enableRowScaling(boolean);
-    method protected androidx.leanback.widget.VerticalGridView! findGridViewFromRoot(android.view.View!);
-    method public androidx.leanback.widget.RowPresenter.ViewHolder! findRowViewHolderByPosition(int);
-    method public final androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method public final androidx.leanback.widget.ItemBridgeAdapter! getBridgeAdapter();
-    method public androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapter! getMainFragmentAdapter();
-    method public androidx.leanback.app.BrowseSupportFragment.MainFragmentRowsAdapter! getMainFragmentRowsAdapter();
-    method public androidx.leanback.widget.BaseOnItemViewClickedListener! getOnItemViewClickedListener();
-    method public androidx.leanback.widget.BaseOnItemViewSelectedListener! getOnItemViewSelectedListener();
-    method public final androidx.leanback.widget.PresenterSelector! getPresenterSelector();
-    method public androidx.leanback.widget.RowPresenter.ViewHolder! getRowViewHolder(int);
-    method public int getSelectedPosition();
-    method public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
-    method public boolean isScrolling();
-    method public void onTransitionEnd();
-    method public boolean onTransitionPrepare();
-    method public void onTransitionStart();
-    method public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setAlignment(int);
-    method public void setEntranceTransitionState(boolean);
-    method public void setExpand(boolean);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method public final void setPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method public void setSelectedPosition(int);
-    method public void setSelectedPosition(int, boolean);
-    method public void setSelectedPosition(int, boolean, androidx.leanback.widget.Presenter.ViewHolderTask!);
-  }
-
-  public static class RowsSupportFragment.MainFragmentAdapter extends androidx.leanback.app.BrowseSupportFragment.MainFragmentAdapter<androidx.leanback.app.RowsSupportFragment> {
-    ctor public RowsSupportFragment.MainFragmentAdapter(androidx.leanback.app.RowsSupportFragment!);
-  }
-
-  public static class RowsSupportFragment.MainFragmentRowsAdapter extends androidx.leanback.app.BrowseSupportFragment.MainFragmentRowsAdapter<androidx.leanback.app.RowsSupportFragment> {
-    ctor public RowsSupportFragment.MainFragmentRowsAdapter(androidx.leanback.app.RowsSupportFragment!);
-  }
-
-  @Deprecated public class SearchFragment extends android.app.Fragment {
-    ctor @Deprecated public SearchFragment();
-    method @Deprecated public static android.os.Bundle! createArgs(android.os.Bundle!, String!);
-    method @Deprecated public static android.os.Bundle! createArgs(android.os.Bundle!, String!, String!);
-    method @Deprecated public void displayCompletions(android.view.inputmethod.CompletionInfo![]!);
-    method @Deprecated public void displayCompletions(java.util.List<java.lang.String!>!);
-    method @Deprecated public android.graphics.drawable.Drawable! getBadgeDrawable();
-    method @Deprecated public android.content.Intent! getRecognizerIntent();
-    method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
-    method @Deprecated public String! getTitle();
-    method @Deprecated public static androidx.leanback.app.SearchFragment! newInstance(String!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onPause();
-    method @Deprecated public void onRequestPermissionsResult(int, String![]!, int[]!);
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
-    method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method @Deprecated public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method @Deprecated public void setSearchAffordanceColorsInListening(androidx.leanback.widget.SearchOrbView.Colors!);
-    method @Deprecated public void setSearchQuery(android.content.Intent!, boolean);
-    method @Deprecated public void setSearchQuery(String!, boolean);
-    method @Deprecated public void setSearchResultProvider(androidx.leanback.app.SearchFragment.SearchResultProvider!);
-    method @Deprecated public void setSpeechRecognitionCallback(androidx.leanback.widget.SpeechRecognitionCallback!);
-    method @Deprecated public void setTitle(String!);
-    method @Deprecated public void startRecognition();
-  }
-
-  @Deprecated public static interface SearchFragment.SearchResultProvider {
-    method @Deprecated public androidx.leanback.widget.ObjectAdapter! getResultsAdapter();
-    method @Deprecated public boolean onQueryTextChange(String!);
-    method @Deprecated public boolean onQueryTextSubmit(String!);
-  }
-
-  public class SearchSupportFragment extends androidx.fragment.app.Fragment {
-    ctor public SearchSupportFragment();
-    method public static android.os.Bundle! createArgs(android.os.Bundle!, String!);
-    method public static android.os.Bundle! createArgs(android.os.Bundle!, String!, String!);
-    method public void displayCompletions(android.view.inputmethod.CompletionInfo![]!);
-    method public void displayCompletions(java.util.List<java.lang.String!>!);
-    method public android.graphics.drawable.Drawable! getBadgeDrawable();
-    method public android.content.Intent! getRecognizerIntent();
-    method public androidx.leanback.app.RowsSupportFragment! getRowsSupportFragment();
-    method public String! getTitle();
-    method public static androidx.leanback.app.SearchSupportFragment! newInstance(String!);
-    method public void setBadgeDrawable(android.graphics.drawable.Drawable!);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setSearchAffordanceColorsInListening(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setSearchQuery(android.content.Intent!, boolean);
-    method public void setSearchQuery(String!, boolean);
-    method public void setSearchResultProvider(androidx.leanback.app.SearchSupportFragment.SearchResultProvider!);
-    method @Deprecated public void setSpeechRecognitionCallback(androidx.leanback.widget.SpeechRecognitionCallback!);
-    method public void setTitle(String!);
-    method public void startRecognition();
-  }
-
-  public static interface SearchSupportFragment.SearchResultProvider {
-    method public androidx.leanback.widget.ObjectAdapter! getResultsAdapter();
-    method public boolean onQueryTextChange(String!);
-    method public boolean onQueryTextSubmit(String!);
-  }
-
-  @Deprecated public class VerticalGridFragment extends androidx.leanback.app.BaseFragment {
-    ctor @Deprecated public VerticalGridFragment();
-    method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method @Deprecated public androidx.leanback.widget.VerticalGridPresenter! getGridPresenter();
-    method @Deprecated public androidx.leanback.widget.OnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setGridPresenter(androidx.leanback.widget.VerticalGridPresenter!);
-    method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
-    method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
-    method @Deprecated public void setSelectedPosition(int);
-  }
-
-  public class VerticalGridSupportFragment extends androidx.leanback.app.BaseSupportFragment {
-    ctor public VerticalGridSupportFragment();
-    method public androidx.leanback.widget.ObjectAdapter? getAdapter();
-    method public androidx.leanback.widget.VerticalGridPresenter? getGridPresenter();
-    method public androidx.leanback.widget.OnItemViewClickedListener? getOnItemViewClickedListener();
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter?);
-    method public void setGridPresenter(androidx.leanback.widget.VerticalGridPresenter);
-    method public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener?);
-    method public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener?);
-    method public void setSelectedPosition(int);
-  }
-
-  @Deprecated public class VideoFragment extends androidx.leanback.app.PlaybackFragment {
-    ctor @Deprecated public VideoFragment();
-    method @Deprecated public android.view.SurfaceView! getSurfaceView();
-    method @Deprecated public void setSurfaceHolderCallback(android.view.SurfaceHolder.Callback!);
-  }
-
-  @Deprecated public class VideoFragmentGlueHost extends androidx.leanback.app.PlaybackFragmentGlueHost implements androidx.leanback.media.SurfaceHolderGlueHost {
-    ctor @Deprecated public VideoFragmentGlueHost(androidx.leanback.app.VideoFragment!);
-    method @Deprecated public void setSurfaceHolderCallback(android.view.SurfaceHolder.Callback!);
-  }
-
-  public class VideoSupportFragment extends androidx.leanback.app.PlaybackSupportFragment {
-    ctor public VideoSupportFragment();
-    method public android.view.SurfaceView! getSurfaceView();
-    method public void setSurfaceHolderCallback(android.view.SurfaceHolder.Callback!);
-  }
-
-  public class VideoSupportFragmentGlueHost extends androidx.leanback.app.PlaybackSupportFragmentGlueHost implements androidx.leanback.media.SurfaceHolderGlueHost {
-    ctor public VideoSupportFragmentGlueHost(androidx.leanback.app.VideoSupportFragment!);
-    method public void setSurfaceHolderCallback(android.view.SurfaceHolder.Callback!);
-  }
-
-}
-
-package androidx.leanback.database {
-
-  public abstract class CursorMapper {
-    ctor public CursorMapper();
-    method protected abstract Object! bind(android.database.Cursor!);
-    method protected abstract void bindColumns(android.database.Cursor!);
-    method public Object! convert(android.database.Cursor!);
-  }
-
-}
-
-package androidx.leanback.graphics {
-
-  public class BoundsRule {
-    ctor public BoundsRule();
-    ctor public BoundsRule(androidx.leanback.graphics.BoundsRule);
-    method public void calculateBounds(android.graphics.Rect, android.graphics.Rect);
-    field public androidx.leanback.graphics.BoundsRule.ValueRule? bottom;
-    field public androidx.leanback.graphics.BoundsRule.ValueRule? left;
-    field public androidx.leanback.graphics.BoundsRule.ValueRule? right;
-    field public androidx.leanback.graphics.BoundsRule.ValueRule? top;
-  }
-
-  public static final class BoundsRule.ValueRule {
-    method public static androidx.leanback.graphics.BoundsRule.ValueRule absoluteValue(int);
-    method public int getAbsoluteValue();
-    method public float getFraction();
-    method public static androidx.leanback.graphics.BoundsRule.ValueRule inheritFromParent(float);
-    method public static androidx.leanback.graphics.BoundsRule.ValueRule inheritFromParentWithOffset(float, int);
-    method public void setAbsoluteValue(int);
-    method public void setFraction(float);
-  }
-
-  public final class ColorFilterCache {
-    method public static androidx.leanback.graphics.ColorFilterCache! getColorFilterCache(int);
-    method public android.graphics.ColorFilter! getFilterForLevel(float);
-  }
-
-  public final class ColorFilterDimmer {
-    method public void applyFilterToView(android.view.View!);
-    method public static androidx.leanback.graphics.ColorFilterDimmer! create(androidx.leanback.graphics.ColorFilterCache!, float, float);
-    method public static androidx.leanback.graphics.ColorFilterDimmer! createDefault(android.content.Context!);
-    method public android.graphics.ColorFilter! getColorFilter();
-    method public android.graphics.Paint! getPaint();
-    method public void setActiveLevel(float);
-  }
-
-  public final class ColorOverlayDimmer {
-    method public int applyToColor(int);
-    method public static androidx.leanback.graphics.ColorOverlayDimmer! createColorOverlayDimmer(int, float, float);
-    method public static androidx.leanback.graphics.ColorOverlayDimmer! createDefault(android.content.Context!);
-    method public void drawColorOverlay(android.graphics.Canvas!, android.view.View!, boolean);
-    method public int getAlpha();
-    method public float getAlphaFloat();
-    method public android.graphics.Paint! getPaint();
-    method public boolean needsDraw();
-    method public void setActiveLevel(float);
-  }
-
-  public class CompositeDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
-    ctor public CompositeDrawable();
-    method public void addChildDrawable(android.graphics.drawable.Drawable);
-    method public void draw(android.graphics.Canvas);
-    method public androidx.leanback.graphics.CompositeDrawable.ChildDrawable getChildAt(int);
-    method public int getChildCount();
-    method public android.graphics.drawable.Drawable getDrawable(int);
-    method public int getOpacity();
-    method public void invalidateDrawable(android.graphics.drawable.Drawable);
-    method public void removeChild(int);
-    method public void removeDrawable(android.graphics.drawable.Drawable);
-    method public void scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long);
-    method public void setAlpha(int);
-    method public void setChildDrawableAt(int, android.graphics.drawable.Drawable);
-    method public void setColorFilter(android.graphics.ColorFilter?);
-    method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
-  }
-
-  public static final class CompositeDrawable.ChildDrawable {
-    ctor public CompositeDrawable.ChildDrawable(android.graphics.drawable.Drawable, androidx.leanback.graphics.CompositeDrawable);
-    method public androidx.leanback.graphics.BoundsRule getBoundsRule();
-    method public android.graphics.drawable.Drawable getDrawable();
-    method public void recomputeBounds();
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Integer!>! BOTTOM_ABSOLUTE;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Float!>! BOTTOM_FRACTION;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Integer!>! LEFT_ABSOLUTE;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Float!>! LEFT_FRACTION;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Integer!>! RIGHT_ABSOLUTE;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Float!>! RIGHT_FRACTION;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Integer!>! TOP_ABSOLUTE;
-    field public static final android.util.Property<androidx.leanback.graphics.CompositeDrawable.ChildDrawable!,java.lang.Float!>! TOP_FRACTION;
-  }
-
-  public class FitWidthBitmapDrawable extends android.graphics.drawable.Drawable {
-    ctor public FitWidthBitmapDrawable();
-    method public void draw(android.graphics.Canvas);
-    method public android.graphics.Bitmap! getBitmap();
-    method public int getOpacity();
-    method public android.graphics.Rect! getSource();
-    method public int getVerticalOffset();
-    method public void setAlpha(int);
-    method public void setBitmap(android.graphics.Bitmap!);
-    method public void setColorFilter(android.graphics.ColorFilter!);
-    method public void setSource(android.graphics.Rect!);
-    method public void setVerticalOffset(int);
-    field public static final android.util.Property<androidx.leanback.graphics.FitWidthBitmapDrawable!,java.lang.Integer!>! PROPERTY_VERTICAL_OFFSET;
-  }
-
-}
-
-package androidx.leanback.media {
-
-  public class MediaControllerAdapter extends androidx.leanback.media.PlayerAdapter {
-    ctor public MediaControllerAdapter(android.support.v4.media.session.MediaControllerCompat!);
-    method public android.graphics.drawable.Drawable! getMediaArt(android.content.Context!);
-    method public android.support.v4.media.session.MediaControllerCompat! getMediaController();
-    method public CharSequence! getMediaSubtitle();
-    method public CharSequence! getMediaTitle();
-    method public void pause();
-    method public void play();
-  }
-
-  @Deprecated public abstract class MediaControllerGlue extends androidx.leanback.media.PlaybackControlGlue {
-    ctor @Deprecated public MediaControllerGlue(android.content.Context!, int[]!, int[]!);
-    method @Deprecated public void attachToMediaController(android.support.v4.media.session.MediaControllerCompat!);
-    method @Deprecated public void detach();
-    method @Deprecated public int getCurrentPosition();
-    method @Deprecated public int getCurrentSpeedId();
-    method @Deprecated public android.graphics.drawable.Drawable! getMediaArt();
-    method @Deprecated public final android.support.v4.media.session.MediaControllerCompat! getMediaController();
-    method @Deprecated public int getMediaDuration();
-    method @Deprecated public CharSequence! getMediaSubtitle();
-    method @Deprecated public CharSequence! getMediaTitle();
-    method @Deprecated public long getSupportedActions();
-    method @Deprecated public boolean hasValidMedia();
-    method @Deprecated public boolean isMediaPlaying();
-  }
-
-  public class MediaPlayerAdapter extends androidx.leanback.media.PlayerAdapter {
-    ctor public MediaPlayerAdapter(android.content.Context!);
-    method public final android.media.MediaPlayer! getMediaPlayer();
-    method public int getProgressUpdatingInterval();
-    method protected boolean onError(int, int);
-    method protected boolean onInfo(int, int);
-    method protected void onSeekComplete();
-    method public void pause();
-    method public void play();
-    method public void release();
-    method public void reset();
-    method public boolean setDataSource(android.net.Uri!);
-  }
-
-  public class PlaybackBannerControlGlue<T extends androidx.leanback.media.PlayerAdapter> extends androidx.leanback.media.PlaybackBaseControlGlue<T> {
-    ctor public PlaybackBannerControlGlue(android.content.Context, int[], int[], T!);
-    ctor public PlaybackBannerControlGlue(android.content.Context, int[], T!);
-    method public int[] getFastForwardSpeeds();
-    method public int[] getRewindSpeeds();
-    method public void onActionClicked(androidx.leanback.widget.Action);
-    method protected androidx.leanback.widget.PlaybackRowPresenter onCreateRowPresenter();
-    method public boolean onKey(android.view.View!, int, android.view.KeyEvent!);
-    field public static final int ACTION_CUSTOM_LEFT_FIRST = 1; // 0x1
-    field public static final int ACTION_CUSTOM_RIGHT_FIRST = 4096; // 0x1000
-    field public static final int ACTION_FAST_FORWARD = 128; // 0x80
-    field public static final int ACTION_PLAY_PAUSE = 64; // 0x40
-    field public static final int ACTION_REWIND = 32; // 0x20
-    field public static final int ACTION_SKIP_TO_NEXT = 256; // 0x100
-    field public static final int ACTION_SKIP_TO_PREVIOUS = 16; // 0x10
-    field public static final int PLAYBACK_SPEED_FAST_L0 = 10; // 0xa
-    field public static final int PLAYBACK_SPEED_FAST_L1 = 11; // 0xb
-    field public static final int PLAYBACK_SPEED_FAST_L2 = 12; // 0xc
-    field public static final int PLAYBACK_SPEED_FAST_L3 = 13; // 0xd
-    field public static final int PLAYBACK_SPEED_FAST_L4 = 14; // 0xe
-    field public static final int PLAYBACK_SPEED_INVALID = -1; // 0xffffffff
-    field public static final int PLAYBACK_SPEED_NORMAL = 1; // 0x1
-    field public static final int PLAYBACK_SPEED_PAUSED = 0; // 0x0
-  }
-
-  public abstract class PlaybackBaseControlGlue<T extends androidx.leanback.media.PlayerAdapter> extends androidx.leanback.media.PlaybackGlue implements androidx.leanback.widget.OnActionClickedListener android.view.View.OnKeyListener {
-    ctor public PlaybackBaseControlGlue(android.content.Context, T!);
-    method public android.graphics.drawable.Drawable? getArt();
-    method public final long getBufferedPosition();
-    method public androidx.leanback.widget.PlaybackControlsRow? getControlsRow();
-    method public long getCurrentPosition();
-    method public final long getDuration();
-    method public androidx.leanback.widget.PlaybackRowPresenter? getPlaybackRowPresenter();
-    method public final T! getPlayerAdapter();
-    method public CharSequence? getSubtitle();
-    method public long getSupportedActions();
-    method public CharSequence? getTitle();
-    method public boolean isControlsOverlayAutoHideEnabled();
-    method public final boolean isPlaying();
-    method public final boolean isPrepared();
-    method protected static void notifyItemChanged(androidx.leanback.widget.ArrayObjectAdapter, Object);
-    method protected void onCreatePrimaryActions(androidx.leanback.widget.ArrayObjectAdapter);
-    method protected abstract androidx.leanback.widget.PlaybackRowPresenter onCreateRowPresenter();
-    method protected void onCreateSecondaryActions(androidx.leanback.widget.ArrayObjectAdapter);
-    method protected void onMetadataChanged();
-    method @CallSuper protected void onPlayCompleted();
-    method @CallSuper protected void onPlayStateChanged();
-    method @CallSuper protected void onPreparedStateChanged();
-    method @CallSuper protected void onUpdateBufferedProgress();
-    method @CallSuper protected void onUpdateDuration();
-    method @CallSuper protected void onUpdateProgress();
-    method public final void seekTo(long);
-    method public void setArt(android.graphics.drawable.Drawable?);
-    method public void setControlsOverlayAutoHideEnabled(boolean);
-    method public void setControlsRow(androidx.leanback.widget.PlaybackControlsRow);
-    method public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter?);
-    method public void setSubtitle(CharSequence?);
-    method public void setTitle(CharSequence?);
-    field public static final int ACTION_CUSTOM_LEFT_FIRST = 1; // 0x1
-    field public static final int ACTION_CUSTOM_RIGHT_FIRST = 4096; // 0x1000
-    field public static final int ACTION_FAST_FORWARD = 128; // 0x80
-    field public static final int ACTION_PLAY_PAUSE = 64; // 0x40
-    field public static final int ACTION_REPEAT = 512; // 0x200
-    field public static final int ACTION_REWIND = 32; // 0x20
-    field public static final int ACTION_SHUFFLE = 1024; // 0x400
-    field public static final int ACTION_SKIP_TO_NEXT = 256; // 0x100
-    field public static final int ACTION_SKIP_TO_PREVIOUS = 16; // 0x10
-  }
-
-  public abstract class PlaybackControlGlue extends androidx.leanback.media.PlaybackGlue implements androidx.leanback.widget.OnActionClickedListener android.view.View.OnKeyListener {
-    ctor public PlaybackControlGlue(android.content.Context!, int[]!);
-    ctor public PlaybackControlGlue(android.content.Context!, int[]!, int[]!);
-    method public void enableProgressUpdating(boolean);
-    method public androidx.leanback.widget.PlaybackControlsRow! getControlsRow();
-    method @Deprecated public androidx.leanback.widget.PlaybackControlsRowPresenter! getControlsRowPresenter();
-    method public abstract int getCurrentPosition();
-    method public abstract int getCurrentSpeedId();
-    method public int[]! getFastForwardSpeeds();
-    method public abstract android.graphics.drawable.Drawable! getMediaArt();
-    method public abstract int getMediaDuration();
-    method public abstract CharSequence! getMediaSubtitle();
-    method public abstract CharSequence! getMediaTitle();
-    method public androidx.leanback.widget.PlaybackRowPresenter! getPlaybackRowPresenter();
-    method public int[]! getRewindSpeeds();
-    method public abstract long getSupportedActions();
-    method public int getUpdatePeriod();
-    method public abstract boolean hasValidMedia();
-    method public boolean isFadingEnabled();
-    method public abstract boolean isMediaPlaying();
-    method public void onActionClicked(androidx.leanback.widget.Action!);
-    method protected void onCreateControlsRowAndPresenter();
-    method protected void onCreatePrimaryActions(androidx.leanback.widget.SparseArrayObjectAdapter!);
-    method protected void onCreateSecondaryActions(androidx.leanback.widget.ArrayObjectAdapter!);
-    method public boolean onKey(android.view.View!, int, android.view.KeyEvent!);
-    method protected void onMetadataChanged();
-    method protected void onStateChanged();
-    method public final void play();
-    method public void play(int);
-    method public void setControlsRow(androidx.leanback.widget.PlaybackControlsRow!);
-    method @Deprecated public void setControlsRowPresenter(androidx.leanback.widget.PlaybackControlsRowPresenter!);
-    method public void setFadingEnabled(boolean);
-    method public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
-    method public void updateProgress();
-    field public static final int ACTION_CUSTOM_LEFT_FIRST = 1; // 0x1
-    field public static final int ACTION_CUSTOM_RIGHT_FIRST = 4096; // 0x1000
-    field public static final int ACTION_FAST_FORWARD = 128; // 0x80
-    field public static final int ACTION_PLAY_PAUSE = 64; // 0x40
-    field public static final int ACTION_REWIND = 32; // 0x20
-    field public static final int ACTION_SKIP_TO_NEXT = 256; // 0x100
-    field public static final int ACTION_SKIP_TO_PREVIOUS = 16; // 0x10
-    field public static final int PLAYBACK_SPEED_FAST_L0 = 10; // 0xa
-    field public static final int PLAYBACK_SPEED_FAST_L1 = 11; // 0xb
-    field public static final int PLAYBACK_SPEED_FAST_L2 = 12; // 0xc
-    field public static final int PLAYBACK_SPEED_FAST_L3 = 13; // 0xd
-    field public static final int PLAYBACK_SPEED_FAST_L4 = 14; // 0xe
-    field public static final int PLAYBACK_SPEED_INVALID = -1; // 0xffffffff
-    field public static final int PLAYBACK_SPEED_NORMAL = 1; // 0x1
-    field public static final int PLAYBACK_SPEED_PAUSED = 0; // 0x0
-  }
-
-  public abstract class PlaybackGlue {
-    ctor public PlaybackGlue(android.content.Context);
-    method public void addPlayerCallback(androidx.leanback.media.PlaybackGlue.PlayerCallback);
-    method public android.content.Context getContext();
-    method public androidx.leanback.media.PlaybackGlueHost? getHost();
-    method protected java.util.List<androidx.leanback.media.PlaybackGlue.PlayerCallback!>? getPlayerCallbacks();
-    method public boolean isPlaying();
-    method public boolean isPrepared();
-    method public void next();
-    method @CallSuper protected void onAttachedToHost(androidx.leanback.media.PlaybackGlueHost);
-    method @CallSuper protected void onDetachedFromHost();
-    method protected void onHostPause();
-    method protected void onHostResume();
-    method protected void onHostStart();
-    method protected void onHostStop();
-    method public void pause();
-    method public void play();
-    method public void playWhenPrepared();
-    method public void previous();
-    method public void removePlayerCallback(androidx.leanback.media.PlaybackGlue.PlayerCallback);
-    method public final void setHost(androidx.leanback.media.PlaybackGlueHost?);
-  }
-
-  public abstract static class PlaybackGlue.PlayerCallback {
-    ctor public PlaybackGlue.PlayerCallback();
-    method public void onPlayCompleted(androidx.leanback.media.PlaybackGlue);
-    method public void onPlayStateChanged(androidx.leanback.media.PlaybackGlue);
-    method public void onPreparedStateChanged(androidx.leanback.media.PlaybackGlue);
-  }
-
-  public abstract class PlaybackGlueHost {
-    ctor public PlaybackGlueHost();
-    method @Deprecated public void fadeOut();
-    method public androidx.leanback.media.PlaybackGlueHost.PlayerCallback! getPlayerCallback();
-    method public void hideControlsOverlay(boolean);
-    method public boolean isControlsOverlayAutoHideEnabled();
-    method public boolean isControlsOverlayVisible();
-    method public void notifyPlaybackRowChanged();
-    method public void setControlsOverlayAutoHideEnabled(boolean);
-    method @Deprecated public void setFadingEnabled(boolean);
-    method public void setHostCallback(androidx.leanback.media.PlaybackGlueHost.HostCallback!);
-    method public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method public void setOnKeyInterceptListener(android.view.View.OnKeyListener!);
-    method public void setPlaybackRow(androidx.leanback.widget.Row!);
-    method public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
-    method public void showControlsOverlay(boolean);
-  }
-
-  public abstract static class PlaybackGlueHost.HostCallback {
-    ctor public PlaybackGlueHost.HostCallback();
-    method public void onHostDestroy();
-    method public void onHostPause();
-    method public void onHostResume();
-    method public void onHostStart();
-    method public void onHostStop();
-  }
-
-  public static class PlaybackGlueHost.PlayerCallback {
-    ctor public PlaybackGlueHost.PlayerCallback();
-    method public void onBufferingStateChanged(boolean);
-    method public void onError(int, CharSequence!);
-    method public void onVideoSizeChanged(int, int);
-  }
-
-  public class PlaybackTransportControlGlue<T extends androidx.leanback.media.PlayerAdapter> extends androidx.leanback.media.PlaybackBaseControlGlue<T> {
-    ctor public PlaybackTransportControlGlue(android.content.Context!, T!);
-    method public final androidx.leanback.widget.PlaybackSeekDataProvider! getSeekProvider();
-    method public final boolean isSeekEnabled();
-    method public void onActionClicked(androidx.leanback.widget.Action);
-    method protected androidx.leanback.widget.PlaybackRowPresenter onCreateRowPresenter();
-    method public boolean onKey(android.view.View!, int, android.view.KeyEvent!);
-    method public final void setSeekEnabled(boolean);
-    method public final void setSeekProvider(androidx.leanback.widget.PlaybackSeekDataProvider!);
-  }
-
-  public abstract class PlayerAdapter {
-    ctor public PlayerAdapter();
-    method public void fastForward();
-    method public long getBufferedPosition();
-    method public final androidx.leanback.media.PlayerAdapter.Callback? getCallback();
-    method public long getCurrentPosition();
-    method public long getDuration();
-    method public long getSupportedActions();
-    method public boolean isPlaying();
-    method public boolean isPrepared();
-    method public void next();
-    method public void onAttachedToHost(androidx.leanback.media.PlaybackGlueHost);
-    method public void onDetachedFromHost();
-    method public abstract void pause();
-    method public abstract void play();
-    method public void previous();
-    method public void rewind();
-    method public void seekTo(long);
-    method public final void setCallback(androidx.leanback.media.PlayerAdapter.Callback?);
-    method public void setProgressUpdatingEnabled(boolean);
-    method public void setRepeatAction(int);
-    method public void setShuffleAction(int);
-  }
-
-  public static class PlayerAdapter.Callback {
-    ctor public PlayerAdapter.Callback();
-    method public void onBufferedPositionChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onBufferingStateChanged(androidx.leanback.media.PlayerAdapter, boolean);
-    method public void onCurrentPositionChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onDurationChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onError(androidx.leanback.media.PlayerAdapter, int, String?);
-    method public void onMetadataChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onPlayCompleted(androidx.leanback.media.PlayerAdapter);
-    method public void onPlayStateChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onPreparedStateChanged(androidx.leanback.media.PlayerAdapter);
-    method public void onVideoSizeChanged(androidx.leanback.media.PlayerAdapter, int, int);
-  }
-
-  public interface SurfaceHolderGlueHost {
-    method public void setSurfaceHolderCallback(android.view.SurfaceHolder.Callback?);
-  }
-
-}
-
-package androidx.leanback.system {
-
-  public class Settings {
-    method public boolean getBoolean(String!);
-    method public static androidx.leanback.system.Settings! getInstance(android.content.Context!);
-    method public void setBoolean(String!, boolean);
-    field public static final String OUTLINE_CLIPPING_DISABLED = "OUTLINE_CLIPPING_DISABLED";
-    field public static final String PREFER_STATIC_SHADOWS = "PREFER_STATIC_SHADOWS";
-  }
-
-}
-
-package androidx.leanback.widget {
-
-  public abstract class AbstractDetailsDescriptionPresenter extends androidx.leanback.widget.Presenter {
-    ctor public AbstractDetailsDescriptionPresenter();
-    method protected abstract void onBindDescription(androidx.leanback.widget.AbstractDetailsDescriptionPresenter.ViewHolder, Object);
-    method public final void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public final androidx.leanback.widget.AbstractDetailsDescriptionPresenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-  }
-
-  public static class AbstractDetailsDescriptionPresenter.ViewHolder extends androidx.leanback.widget.Presenter.ViewHolder {
-    ctor public AbstractDetailsDescriptionPresenter.ViewHolder(android.view.View);
-    method public android.widget.TextView getBody();
-    method public android.widget.TextView getSubtitle();
-    method public android.widget.TextView getTitle();
-  }
-
-  public abstract class AbstractMediaItemPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor public AbstractMediaItemPresenter();
-    ctor public AbstractMediaItemPresenter(int);
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method public androidx.leanback.widget.Presenter! getActionPresenter();
-    method protected int getMediaPlayState(Object!);
-    method public int getThemeId();
-    method public boolean hasMediaRowSeparator();
-    method protected abstract void onBindMediaDetails(androidx.leanback.widget.AbstractMediaItemPresenter.ViewHolder!, Object!);
-    method public void onBindMediaPlayState(androidx.leanback.widget.AbstractMediaItemPresenter.ViewHolder!);
-    method protected void onBindRowActions(androidx.leanback.widget.AbstractMediaItemPresenter.ViewHolder!);
-    method protected void onUnbindMediaDetails(androidx.leanback.widget.AbstractMediaItemPresenter.ViewHolder!);
-    method public void onUnbindMediaPlayState(androidx.leanback.widget.AbstractMediaItemPresenter.ViewHolder!);
-    method public void setActionPresenter(androidx.leanback.widget.Presenter!);
-    method public void setBackgroundColor(int);
-    method public void setHasMediaRowSeparator(boolean);
-    method public void setThemeId(int);
-    field public static final int PLAY_STATE_INITIAL = 0; // 0x0
-    field public static final int PLAY_STATE_PAUSED = 1; // 0x1
-    field public static final int PLAY_STATE_PLAYING = 2; // 0x2
-  }
-
-  public static class AbstractMediaItemPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor public AbstractMediaItemPresenter.ViewHolder(android.view.View!);
-    method public android.view.ViewGroup! getMediaItemActionsContainer();
-    method public android.view.View! getMediaItemDetailsView();
-    method public android.widget.TextView! getMediaItemDurationView();
-    method public android.widget.TextView! getMediaItemNameView();
-    method public android.widget.TextView! getMediaItemNumberView();
-    method public android.widget.ViewFlipper! getMediaItemNumberViewFlipper();
-    method public android.view.View! getMediaItemPausedView();
-    method public android.view.View! getMediaItemPlayingView();
-    method public androidx.leanback.widget.MultiActionsProvider.MultiAction![]! getMediaItemRowActions();
-    method public android.view.View! getMediaItemRowSeparator();
-    method public android.view.View! getSelectorView();
-    method public void notifyActionChanged(androidx.leanback.widget.MultiActionsProvider.MultiAction!);
-    method public void notifyDetailsChanged();
-    method public void notifyPlayStateChanged();
-    method public void onBindRowActions();
-    method public void setSelectedMediaItemNumberView(int);
-  }
-
-  public abstract class AbstractMediaListHeaderPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor public AbstractMediaListHeaderPresenter();
-    ctor public AbstractMediaListHeaderPresenter(android.content.Context!, int);
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method protected abstract void onBindMediaListHeaderViewHolder(androidx.leanback.widget.AbstractMediaListHeaderPresenter.ViewHolder!, Object!);
-    method public void setBackgroundColor(int);
-  }
-
-  public static class AbstractMediaListHeaderPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor public AbstractMediaListHeaderPresenter.ViewHolder(android.view.View!);
-    method public android.widget.TextView! getHeaderView();
-  }
-
-  public class Action {
-    ctor public Action(long);
-    ctor public Action(long, CharSequence?);
-    ctor public Action(long, CharSequence?, CharSequence?);
-    ctor public Action(long, CharSequence?, CharSequence?, android.graphics.drawable.Drawable?);
-    method public final void addKeyCode(int);
-    method public final android.graphics.drawable.Drawable? getIcon();
-    method public final long getId();
-    method public final CharSequence? getLabel1();
-    method public final CharSequence? getLabel2();
-    method public final void removeKeyCode(int);
-    method public final boolean respondsToKeyCode(int);
-    method public final void setIcon(android.graphics.drawable.Drawable?);
-    method public final void setId(long);
-    method public final void setLabel1(CharSequence?);
-    method public final void setLabel2(CharSequence?);
-    field public static final long NO_ID = -1L; // 0xffffffffffffffffL
-  }
-
-  public class ArrayObjectAdapter extends androidx.leanback.widget.ObjectAdapter {
-    ctor public ArrayObjectAdapter();
-    ctor public ArrayObjectAdapter(androidx.leanback.widget.Presenter);
-    ctor public ArrayObjectAdapter(androidx.leanback.widget.PresenterSelector);
-    method public void add(int, Object);
-    method public void add(Object);
-    method public void addAll(int, java.util.Collection<?>);
-    method public void clear();
-    method public Object? get(int);
-    method public int indexOf(Object);
-    method public void move(int, int);
-    method public void notifyArrayItemRangeChanged(int, int);
-    method public boolean remove(Object);
-    method public int removeItems(int, int);
-    method public void replace(int, Object);
-    method public void setItems(java.util.List, androidx.leanback.widget.DiffCallback?);
-    method public int size();
-    method public <E> java.util.List<E!> unmodifiableList();
-  }
-
-  public class BaseCardView extends android.widget.FrameLayout {
-    ctor public BaseCardView(android.content.Context!);
-    ctor public BaseCardView(android.content.Context!, android.util.AttributeSet!);
-    ctor public BaseCardView(android.content.Context!, android.util.AttributeSet!, int);
-    method protected androidx.leanback.widget.BaseCardView.LayoutParams! generateDefaultLayoutParams();
-    method public androidx.leanback.widget.BaseCardView.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-    method protected androidx.leanback.widget.BaseCardView.LayoutParams! generateLayoutParams(android.view.ViewGroup.LayoutParams!);
-    method public int getCardType();
-    method @Deprecated public int getExtraVisibility();
-    method public int getInfoVisibility();
-    method public boolean isSelectedAnimationDelayed();
-    method public void setCardType(int);
-    method @Deprecated public void setExtraVisibility(int);
-    method public void setInfoVisibility(int);
-    method public void setSelectedAnimationDelayed(boolean);
-    field public static final int CARD_REGION_VISIBLE_ACTIVATED = 1; // 0x1
-    field public static final int CARD_REGION_VISIBLE_ALWAYS = 0; // 0x0
-    field public static final int CARD_REGION_VISIBLE_SELECTED = 2; // 0x2
-    field public static final int CARD_TYPE_INFO_OVER = 1; // 0x1
-    field public static final int CARD_TYPE_INFO_UNDER = 2; // 0x2
-    field public static final int CARD_TYPE_INFO_UNDER_WITH_EXTRA = 3; // 0x3
-    field public static final int CARD_TYPE_MAIN_ONLY = 0; // 0x0
-  }
-
-  public static class BaseCardView.LayoutParams extends android.widget.FrameLayout.LayoutParams {
-    ctor public BaseCardView.LayoutParams(android.content.Context!, android.util.AttributeSet!);
-    ctor public BaseCardView.LayoutParams(android.view.ViewGroup.LayoutParams!);
-    ctor public BaseCardView.LayoutParams(androidx.leanback.widget.BaseCardView.LayoutParams!);
-    ctor public BaseCardView.LayoutParams(int, int);
-    field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
-    field public static final int VIEW_TYPE_INFO = 1; // 0x1
-    field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field public int viewType;
-  }
-
-  public interface BaseOnItemViewClickedListener<T> {
-    method public void onItemClicked(androidx.leanback.widget.Presenter.ViewHolder!, Object!, androidx.leanback.widget.RowPresenter.ViewHolder!, T!);
-  }
-
-  public interface BaseOnItemViewSelectedListener<T> {
-    method public void onItemSelected(androidx.leanback.widget.Presenter.ViewHolder!, Object!, androidx.leanback.widget.RowPresenter.ViewHolder!, T!);
-  }
-
-  public class BrowseFrameLayout extends android.widget.FrameLayout {
-    ctor public BrowseFrameLayout(android.content.Context);
-    ctor public BrowseFrameLayout(android.content.Context, android.util.AttributeSet?);
-    ctor public BrowseFrameLayout(android.content.Context, android.util.AttributeSet?, int);
-    method public androidx.leanback.widget.BrowseFrameLayout.OnChildFocusListener? getOnChildFocusListener();
-    method public androidx.leanback.widget.BrowseFrameLayout.OnFocusSearchListener? getOnFocusSearchListener();
-    method public void setOnChildFocusListener(androidx.leanback.widget.BrowseFrameLayout.OnChildFocusListener?);
-    method public void setOnDispatchKeyListener(android.view.View.OnKeyListener?);
-    method public void setOnFocusSearchListener(androidx.leanback.widget.BrowseFrameLayout.OnFocusSearchListener?);
-  }
-
-  public static interface BrowseFrameLayout.OnChildFocusListener {
-    method public void onRequestChildFocus(android.view.View?, android.view.View?);
-    method public boolean onRequestFocusInDescendants(int, android.graphics.Rect?);
-  }
-
-  public static interface BrowseFrameLayout.OnFocusSearchListener {
-    method public android.view.View? onFocusSearch(android.view.View?, int);
-  }
-
-  public final class ClassPresenterSelector extends androidx.leanback.widget.PresenterSelector {
-    ctor public ClassPresenterSelector();
-    method public androidx.leanback.widget.ClassPresenterSelector! addClassPresenter(Class<?>!, androidx.leanback.widget.Presenter!);
-    method public androidx.leanback.widget.ClassPresenterSelector! addClassPresenterSelector(Class<?>!, androidx.leanback.widget.PresenterSelector!);
-    method public androidx.leanback.widget.Presenter? getPresenter(Object?);
-  }
-
-  public class ControlButtonPresenterSelector extends androidx.leanback.widget.PresenterSelector {
-    ctor public ControlButtonPresenterSelector();
-    method public androidx.leanback.widget.Presenter? getPresenter(Object?);
-    method public androidx.leanback.widget.Presenter! getPrimaryPresenter();
-    method public androidx.leanback.widget.Presenter! getSecondaryPresenter();
-  }
-
-  public class CursorObjectAdapter extends androidx.leanback.widget.ObjectAdapter {
-    ctor public CursorObjectAdapter();
-    ctor public CursorObjectAdapter(androidx.leanback.widget.Presenter!);
-    ctor public CursorObjectAdapter(androidx.leanback.widget.PresenterSelector!);
-    method public void changeCursor(android.database.Cursor!);
-    method public void close();
-    method public Object? get(int);
-    method public final android.database.Cursor! getCursor();
-    method public final androidx.leanback.database.CursorMapper! getMapper();
-    method protected final void invalidateCache(int);
-    method protected final void invalidateCache(int, int);
-    method public boolean isClosed();
-    method protected void onCursorChanged();
-    method protected void onMapperChanged();
-    method public final void setMapper(androidx.leanback.database.CursorMapper!);
-    method public int size();
-    method public android.database.Cursor! swapCursor(android.database.Cursor!);
-  }
-
-  public class DetailsOverviewLogoPresenter extends androidx.leanback.widget.Presenter {
-    ctor public DetailsOverviewLogoPresenter();
-    method public boolean isBoundToImage(androidx.leanback.widget.DetailsOverviewLogoPresenter.ViewHolder, androidx.leanback.widget.DetailsOverviewRow?);
-    method public void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public android.view.View onCreateView(android.view.ViewGroup);
-    method public androidx.leanback.widget.Presenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void setContext(androidx.leanback.widget.DetailsOverviewLogoPresenter.ViewHolder, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder?, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter?);
-  }
-
-  public static class DetailsOverviewLogoPresenter.ViewHolder extends androidx.leanback.widget.Presenter.ViewHolder {
-    ctor public DetailsOverviewLogoPresenter.ViewHolder(android.view.View);
-    method public androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter? getParentPresenter();
-    method public androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder? getParentViewHolder();
-    method public boolean isSizeFromDrawableIntrinsic();
-    method public void setSizeFromDrawableIntrinsic(boolean);
-    field protected androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter? mParentPresenter;
-    field protected androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder? mParentViewHolder;
-  }
-
-  public class DetailsOverviewRow extends androidx.leanback.widget.Row {
-    ctor public DetailsOverviewRow(Object);
-    method @Deprecated public final void addAction(androidx.leanback.widget.Action!);
-    method @Deprecated public final void addAction(int, androidx.leanback.widget.Action!);
-    method public androidx.leanback.widget.Action? getActionForKeyCode(int);
-    method @Deprecated public final java.util.List<androidx.leanback.widget.Action!>! getActions();
-    method public final androidx.leanback.widget.ObjectAdapter getActionsAdapter();
-    method public final android.graphics.drawable.Drawable? getImageDrawable();
-    method public final Object getItem();
-    method public boolean isImageScaleUpAllowed();
-    method @Deprecated public final boolean removeAction(androidx.leanback.widget.Action!);
-    method public final void setActionsAdapter(androidx.leanback.widget.ObjectAdapter);
-    method public final void setImageBitmap(android.content.Context, android.graphics.Bitmap);
-    method public final void setImageDrawable(android.graphics.drawable.Drawable?);
-    method public void setImageScaleUpAllowed(boolean);
-    method public final void setItem(Object);
-  }
-
-  public static class DetailsOverviewRow.Listener {
-    ctor public DetailsOverviewRow.Listener();
-    method public void onActionsAdapterChanged(androidx.leanback.widget.DetailsOverviewRow);
-    method public void onImageDrawableChanged(androidx.leanback.widget.DetailsOverviewRow);
-    method public void onItemChanged(androidx.leanback.widget.DetailsOverviewRow);
-  }
-
-  @Deprecated public class DetailsOverviewRowPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor @Deprecated public DetailsOverviewRowPresenter(androidx.leanback.widget.Presenter!);
-    method @Deprecated protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method @Deprecated @ColorInt public int getBackgroundColor();
-    method @Deprecated public androidx.leanback.widget.OnActionClickedListener! getOnActionClickedListener();
-    method @Deprecated public boolean isStyleLarge();
-    method @Deprecated public final boolean isUsingDefaultSelectEffect();
-    method @Deprecated public void setBackgroundColor(@ColorInt int);
-    method @Deprecated public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method @Deprecated public final void setSharedElementEnterTransition(android.app.Activity!, String!);
-    method @Deprecated public final void setSharedElementEnterTransition(android.app.Activity!, String!, long);
-    method @Deprecated public void setStyleLarge(boolean);
-  }
-
-  @Deprecated public final class DetailsOverviewRowPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor @Deprecated public DetailsOverviewRowPresenter.ViewHolder(android.view.View!, androidx.leanback.widget.Presenter!);
-    field @Deprecated public final androidx.leanback.widget.Presenter.ViewHolder! mDetailsDescriptionViewHolder;
-  }
-
-  public class DetailsParallax extends androidx.leanback.widget.RecyclerViewParallax {
-    ctor public DetailsParallax();
-    method public androidx.leanback.widget.Parallax.IntProperty! getOverviewRowBottom();
-    method public androidx.leanback.widget.Parallax.IntProperty! getOverviewRowTop();
-  }
-
-  public abstract class DiffCallback<Value> {
-    ctor public DiffCallback();
-    method public abstract boolean areContentsTheSame(Value, Value);
-    method public abstract boolean areItemsTheSame(Value, Value);
-    method public Object? getChangePayload(Value, Value);
-  }
-
-  public class DividerPresenter extends androidx.leanback.widget.Presenter {
-    ctor public DividerPresenter();
-    method public void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public androidx.leanback.widget.Presenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-  }
-
-  public class DividerRow extends androidx.leanback.widget.Row {
-    ctor public DividerRow();
-    method public final boolean isRenderedAsRowView();
-  }
-
-  public interface FocusHighlight {
-    field public static final int ZOOM_FACTOR_LARGE = 3; // 0x3
-    field public static final int ZOOM_FACTOR_MEDIUM = 2; // 0x2
-    field public static final int ZOOM_FACTOR_NONE = 0; // 0x0
-    field public static final int ZOOM_FACTOR_SMALL = 1; // 0x1
-    field public static final int ZOOM_FACTOR_XSMALL = 4; // 0x4
-  }
-
-  public class FocusHighlightHelper {
-    ctor @Deprecated public FocusHighlightHelper();
-    method public static void setupBrowseItemFocusHighlight(androidx.leanback.widget.ItemBridgeAdapter!, int, boolean);
-    method public static void setupHeaderItemFocusHighlight(androidx.leanback.widget.ItemBridgeAdapter!);
-    method public static void setupHeaderItemFocusHighlight(androidx.leanback.widget.ItemBridgeAdapter!, boolean);
-    method @Deprecated public static void setupHeaderItemFocusHighlight(androidx.leanback.widget.VerticalGridView!);
-    method @Deprecated public static void setupHeaderItemFocusHighlight(androidx.leanback.widget.VerticalGridView!, boolean);
-  }
-
-  public interface FragmentAnimationProvider {
-    method public void onImeAppearing(java.util.List<android.animation.Animator!>);
-    method public void onImeDisappearing(java.util.List<android.animation.Animator!>);
-  }
-
-  public class FullWidthDetailsOverviewRowPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor public FullWidthDetailsOverviewRowPresenter(androidx.leanback.widget.Presenter!);
-    ctor public FullWidthDetailsOverviewRowPresenter(androidx.leanback.widget.Presenter!, androidx.leanback.widget.DetailsOverviewLogoPresenter!);
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method public final int getActionsBackgroundColor();
-    method public final int getAlignmentMode();
-    method public final int getBackgroundColor();
-    method public final int getInitialState();
-    method protected int getLayoutResourceId();
-    method public androidx.leanback.widget.OnActionClickedListener! getOnActionClickedListener();
-    method public final boolean isParticipatingEntranceTransition();
-    method public final boolean isUsingDefaultSelectEffect();
-    method public final void notifyOnBindLogo(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!);
-    method protected void onLayoutLogo(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, boolean);
-    method protected void onLayoutOverviewFrame(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, boolean);
-    method protected void onStateChanged(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int);
-    method public final void setActionsBackgroundColor(int);
-    method public final void setAlignmentMode(int);
-    method public final void setBackgroundColor(int);
-    method public final void setInitialState(int);
-    method public final void setListener(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.Listener!);
-    method public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method public final void setParticipatingEntranceTransition(boolean);
-    method public final void setState(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int);
-    field public static final int ALIGN_MODE_MIDDLE = 1; // 0x1
-    field public static final int ALIGN_MODE_START = 0; // 0x0
-    field public static final int STATE_FULL = 1; // 0x1
-    field public static final int STATE_HALF = 0; // 0x0
-    field public static final int STATE_SMALL = 2; // 0x2
-    field protected int mInitialState;
-  }
-
-  public abstract static class FullWidthDetailsOverviewRowPresenter.Listener {
-    ctor public FullWidthDetailsOverviewRowPresenter.Listener();
-    method public void onBindLogo(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!);
-  }
-
-  public class FullWidthDetailsOverviewRowPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor public FullWidthDetailsOverviewRowPresenter.ViewHolder(android.view.View!, androidx.leanback.widget.Presenter!, androidx.leanback.widget.DetailsOverviewLogoPresenter!);
-    method protected androidx.leanback.widget.DetailsOverviewRow.Listener! createRowListener();
-    method public final android.view.ViewGroup! getActionsRow();
-    method public final android.view.ViewGroup! getDetailsDescriptionFrame();
-    method public final androidx.leanback.widget.Presenter.ViewHolder! getDetailsDescriptionViewHolder();
-    method public final androidx.leanback.widget.DetailsOverviewLogoPresenter.ViewHolder! getLogoViewHolder();
-    method public final android.view.ViewGroup! getOverviewView();
-    method public final int getState();
-    field protected final androidx.leanback.widget.DetailsOverviewRow.Listener! mRowListener;
-  }
-
-  public class FullWidthDetailsOverviewRowPresenter.ViewHolder.DetailsOverviewRowListener extends androidx.leanback.widget.DetailsOverviewRow.Listener {
-    ctor public FullWidthDetailsOverviewRowPresenter.ViewHolder.DetailsOverviewRowListener();
-  }
-
-  public class FullWidthDetailsOverviewSharedElementHelper extends androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.Listener {
-    ctor public FullWidthDetailsOverviewSharedElementHelper();
-    method public boolean getAutoStartSharedElementTransition();
-    method public void setAutoStartSharedElementTransition(boolean);
-    method public void setSharedElementEnterTransition(android.app.Activity!, String!);
-    method public void setSharedElementEnterTransition(android.app.Activity!, String!, long);
-    method public void startPostponedEnterTransition();
-  }
-
-  public class GuidanceStylist implements androidx.leanback.widget.FragmentAnimationProvider {
-    ctor public GuidanceStylist();
-    method public android.widget.TextView? getBreadcrumbView();
-    method public android.widget.TextView? getDescriptionView();
-    method public android.widget.ImageView? getIconView();
-    method public android.widget.TextView? getTitleView();
-    method public android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup?, androidx.leanback.widget.GuidanceStylist.Guidance);
-    method public void onDestroyView();
-    method public void onImeAppearing(java.util.List<android.animation.Animator!>);
-    method public void onImeDisappearing(java.util.List<android.animation.Animator!>);
-    method public int onProvideLayoutId();
-  }
-
-  public static class GuidanceStylist.Guidance {
-    ctor public GuidanceStylist.Guidance(String?, String?, String?, android.graphics.drawable.Drawable?);
-    method public String? getBreadcrumb();
-    method public String? getDescription();
-    method public android.graphics.drawable.Drawable? getIconDrawable();
-    method public String? getTitle();
-  }
-
-  public class GuidedAction extends androidx.leanback.widget.Action {
-    ctor protected GuidedAction();
-    method public String![]! getAutofillHints();
-    method public int getCheckSetId();
-    method public CharSequence? getDescription();
-    method public int getDescriptionEditInputType();
-    method public int getDescriptionInputType();
-    method public CharSequence? getEditDescription();
-    method public int getEditInputType();
-    method public CharSequence? getEditTitle();
-    method public int getInputType();
-    method public android.content.Intent? getIntent();
-    method public java.util.List<androidx.leanback.widget.GuidedAction!>? getSubActions();
-    method public CharSequence? getTitle();
-    method public boolean hasEditableActivatorView();
-    method public boolean hasMultilineDescription();
-    method public boolean hasNext();
-    method public boolean hasSubActions();
-    method public boolean hasTextEditable();
-    method public boolean infoOnly();
-    method public final boolean isAutoSaveRestoreEnabled();
-    method public boolean isChecked();
-    method public boolean isDescriptionEditable();
-    method public boolean isEditTitleUsed();
-    method public boolean isEditable();
-    method public boolean isEnabled();
-    method public boolean isFocusable();
-    method public void onRestoreInstanceState(android.os.Bundle, String);
-    method public void onSaveInstanceState(android.os.Bundle, String);
-    method public void setChecked(boolean);
-    method public void setDescription(CharSequence?);
-    method public void setEditDescription(CharSequence?);
-    method public void setEditTitle(CharSequence?);
-    method public void setEnabled(boolean);
-    method public void setFocusable(boolean);
-    method public void setIntent(android.content.Intent?);
-    method public void setSubActions(java.util.List<androidx.leanback.widget.GuidedAction!>?);
-    method public void setTitle(CharSequence?);
-    field public static final long ACTION_ID_CANCEL = -5L; // 0xfffffffffffffffbL
-    field public static final long ACTION_ID_CONTINUE = -7L; // 0xfffffffffffffff9L
-    field public static final long ACTION_ID_CURRENT = -3L; // 0xfffffffffffffffdL
-    field public static final long ACTION_ID_FINISH = -6L; // 0xfffffffffffffffaL
-    field public static final long ACTION_ID_NEXT = -2L; // 0xfffffffffffffffeL
-    field public static final long ACTION_ID_NO = -9L; // 0xfffffffffffffff7L
-    field public static final long ACTION_ID_OK = -4L; // 0xfffffffffffffffcL
-    field public static final long ACTION_ID_YES = -8L; // 0xfffffffffffffff8L
-    field public static final int CHECKBOX_CHECK_SET_ID = -1; // 0xffffffff
-    field public static final int DEFAULT_CHECK_SET_ID = 1; // 0x1
-    field public static final int NO_CHECK_SET = 0; // 0x0
-  }
-
-  public static class GuidedAction.Builder extends androidx.leanback.widget.GuidedAction.BuilderBase<androidx.leanback.widget.GuidedAction.Builder> {
-    ctor @Deprecated public GuidedAction.Builder();
-    ctor public GuidedAction.Builder(android.content.Context?);
-    method public androidx.leanback.widget.GuidedAction build();
-  }
-
-  public abstract static class GuidedAction.BuilderBase<B extends androidx.leanback.widget.GuidedAction.BuilderBase> {
-    ctor public GuidedAction.BuilderBase(android.content.Context);
-    method protected final void applyValues(androidx.leanback.widget.GuidedAction);
-    method public B! autoSaveRestoreEnabled(boolean);
-    method public B! autofillHints(java.lang.String!...);
-    method public B! checkSetId(int);
-    method public B! checked(boolean);
-    method public B! clickAction(long);
-    method public B! description(@StringRes int);
-    method public B! description(CharSequence?);
-    method public B! descriptionEditInputType(int);
-    method public B! descriptionEditable(boolean);
-    method public B! descriptionInputType(int);
-    method public B! editDescription(@StringRes int);
-    method public B! editDescription(CharSequence?);
-    method public B! editInputType(int);
-    method public B! editTitle(@StringRes int);
-    method public B! editTitle(CharSequence?);
-    method public B! editable(boolean);
-    method public B! enabled(boolean);
-    method public B! focusable(boolean);
-    method public android.content.Context getContext();
-    method public B! hasEditableActivatorView(boolean);
-    method public B! hasNext(boolean);
-    method public B! icon(android.graphics.drawable.Drawable?);
-    method public B! icon(@DrawableRes int);
-    method @Deprecated public B! iconResourceId(@DrawableRes int, android.content.Context!);
-    method public B! id(long);
-    method public B! infoOnly(boolean);
-    method public B! inputType(int);
-    method public B! intent(android.content.Intent?);
-    method public B! multilineDescription(boolean);
-    method public B! subActions(java.util.List<androidx.leanback.widget.GuidedAction!>?);
-    method public B! title(@StringRes int);
-    method public B! title(CharSequence?);
-  }
-
-  public interface GuidedActionAutofillSupport {
-    method public void setOnAutofillListener(androidx.leanback.widget.GuidedActionAutofillSupport.OnAutofillListener!);
-  }
-
-  public static interface GuidedActionAutofillSupport.OnAutofillListener {
-    method public void onAutofill(android.view.View!);
-  }
-
-  public class GuidedActionDiffCallback extends androidx.leanback.widget.DiffCallback<androidx.leanback.widget.GuidedAction> {
-    ctor public GuidedActionDiffCallback();
-    method public boolean areContentsTheSame(androidx.leanback.widget.GuidedAction, androidx.leanback.widget.GuidedAction);
-    method public boolean areItemsTheSame(androidx.leanback.widget.GuidedAction, androidx.leanback.widget.GuidedAction);
-    method public static androidx.leanback.widget.GuidedActionDiffCallback getInstance();
-  }
-
-  public class GuidedActionEditText extends android.widget.EditText implements androidx.leanback.widget.GuidedActionAutofillSupport androidx.leanback.widget.ImeKeyMonitor {
-    ctor public GuidedActionEditText(android.content.Context!);
-    ctor public GuidedActionEditText(android.content.Context!, android.util.AttributeSet!);
-    ctor public GuidedActionEditText(android.content.Context!, android.util.AttributeSet!, int);
-    method public void setImeKeyListener(androidx.leanback.widget.ImeKeyMonitor.ImeKeyListener!);
-    method public void setOnAutofillListener(androidx.leanback.widget.GuidedActionAutofillSupport.OnAutofillListener!);
-  }
-
-  public class GuidedActionsStylist implements androidx.leanback.widget.FragmentAnimationProvider {
-    ctor public GuidedActionsStylist();
-    method public void collapseAction(boolean);
-    method public void expandAction(androidx.leanback.widget.GuidedAction, boolean);
-    method public androidx.leanback.widget.VerticalGridView? getActionsGridView();
-    method public androidx.leanback.widget.GuidedAction? getExpandedAction();
-    method public int getItemViewType(androidx.leanback.widget.GuidedAction);
-    method public androidx.leanback.widget.VerticalGridView? getSubActionsGridView();
-    method public final boolean isBackKeyToCollapseActivatorView();
-    method public final boolean isBackKeyToCollapseSubActions();
-    method public boolean isButtonActions();
-    method public boolean isExpandTransitionSupported();
-    method public boolean isExpanded();
-    method public boolean isInExpandTransition();
-    method public boolean isSubActionsExpanded();
-    method public void onAnimateItemChecked(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, boolean);
-    method public void onAnimateItemFocused(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, boolean);
-    method public void onAnimateItemPressed(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, boolean);
-    method public void onAnimateItemPressedCancelled(androidx.leanback.widget.GuidedActionsStylist.ViewHolder);
-    method public void onBindActivatorView(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method public void onBindCheckMarkView(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method public void onBindChevronView(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method public void onBindViewHolder(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method public android.view.View onCreateView(android.view.LayoutInflater, android.view.ViewGroup);
-    method public androidx.leanback.widget.GuidedActionsStylist.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public androidx.leanback.widget.GuidedActionsStylist.ViewHolder onCreateViewHolder(android.view.ViewGroup, int);
-    method public void onDestroyView();
-    method @Deprecated protected void onEditingModeChange(androidx.leanback.widget.GuidedActionsStylist.ViewHolder!, androidx.leanback.widget.GuidedAction!, boolean);
-    method @CallSuper protected void onEditingModeChange(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, boolean, boolean);
-    method public void onImeAppearing(java.util.List<android.animation.Animator!>);
-    method public void onImeDisappearing(java.util.List<android.animation.Animator!>);
-    method public int onProvideItemLayoutId();
-    method public int onProvideItemLayoutId(int);
-    method public int onProvideLayoutId();
-    method public boolean onUpdateActivatorView(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method public void onUpdateExpandedViewHolder(androidx.leanback.widget.GuidedActionsStylist.ViewHolder?);
-    method public void openInEditMode(androidx.leanback.widget.GuidedAction);
-    method public void setAsButtonActions();
-    method public final void setBackKeyToCollapseActivatorView(boolean);
-    method public final void setBackKeyToCollapseSubActions(boolean);
-    method @Deprecated public void setEditingMode(androidx.leanback.widget.GuidedActionsStylist.ViewHolder!, androidx.leanback.widget.GuidedAction!, boolean);
-    method @Deprecated public void setExpandedViewHolder(androidx.leanback.widget.GuidedActionsStylist.ViewHolder!);
-    method protected void setupImeOptions(androidx.leanback.widget.GuidedActionsStylist.ViewHolder, androidx.leanback.widget.GuidedAction);
-    method @Deprecated public void startExpandedTransition(androidx.leanback.widget.GuidedActionsStylist.ViewHolder!);
-    field public static final int VIEW_TYPE_DATE_PICKER = 1; // 0x1
-    field public static final int VIEW_TYPE_DEFAULT = 0; // 0x0
-  }
-
-  public static class GuidedActionsStylist.ViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements androidx.leanback.widget.FacetProvider {
-    ctor public GuidedActionsStylist.ViewHolder(android.view.View);
-    ctor public GuidedActionsStylist.ViewHolder(android.view.View, boolean);
-    method public androidx.leanback.widget.GuidedAction? getAction();
-    method public android.widget.ImageView? getCheckmarkView();
-    method public android.widget.ImageView? getChevronView();
-    method public android.view.View? getContentView();
-    method public android.widget.TextView? getDescriptionView();
-    method public android.widget.EditText? getEditableDescriptionView();
-    method public android.widget.EditText? getEditableTitleView();
-    method public android.view.View? getEditingView();
-    method public Object? getFacet(Class<?>);
-    method public android.widget.ImageView? getIconView();
-    method public android.widget.TextView? getTitleView();
-    method public boolean isInEditing();
-    method public boolean isInEditingActivatorView();
-    method public boolean isInEditingDescription();
-    method public boolean isInEditingText();
-    method public boolean isInEditingTitle();
-    method public boolean isSubAction();
-  }
-
-  public class GuidedDatePickerAction extends androidx.leanback.widget.GuidedAction {
-    ctor public GuidedDatePickerAction();
-    method public long getDate();
-    method public String? getDatePickerFormat();
-    method public long getMaxDate();
-    method public long getMinDate();
-    method public void setDate(long);
-  }
-
-  public static final class GuidedDatePickerAction.Builder extends androidx.leanback.widget.GuidedDatePickerAction.BuilderBase<androidx.leanback.widget.GuidedDatePickerAction.Builder> {
-    ctor public GuidedDatePickerAction.Builder(android.content.Context);
-    method public androidx.leanback.widget.GuidedDatePickerAction build();
-  }
-
-  public abstract static class GuidedDatePickerAction.BuilderBase<B extends androidx.leanback.widget.GuidedDatePickerAction.BuilderBase> extends androidx.leanback.widget.GuidedAction.BuilderBase<B> {
-    ctor public GuidedDatePickerAction.BuilderBase(android.content.Context);
-    method protected final void applyDatePickerValues(androidx.leanback.widget.GuidedDatePickerAction);
-    method public B! date(long);
-    method public B! datePickerFormat(String?);
-    method public B! maxDate(long);
-    method public B! minDate(long);
-  }
-
-  public class HeaderItem {
-    ctor public HeaderItem(String!);
-    ctor public HeaderItem(long, String!);
-    method public CharSequence! getContentDescription();
-    method public CharSequence! getDescription();
-    method public final long getId();
-    method public final String! getName();
-    method public void setContentDescription(CharSequence!);
-    method public void setDescription(CharSequence!);
-  }
-
-  public final class HorizontalHoverCardSwitcher extends androidx.leanback.widget.PresenterSwitcher {
-    ctor public HorizontalHoverCardSwitcher();
-    method protected void insertView(android.view.View!);
-    method public void select(androidx.leanback.widget.HorizontalGridView!, android.view.View!, Object!);
-  }
-
-  public class ImageCardView extends androidx.leanback.widget.BaseCardView {
-    ctor public ImageCardView(android.content.Context);
-    ctor public ImageCardView(android.content.Context, android.util.AttributeSet?);
-    ctor public ImageCardView(android.content.Context, android.util.AttributeSet?, int);
-    ctor @Deprecated public ImageCardView(android.content.Context!, int);
-    method public android.graphics.drawable.Drawable? getBadgeImage();
-    method public CharSequence? getContentText();
-    method public android.graphics.drawable.Drawable? getInfoAreaBackground();
-    method public android.graphics.drawable.Drawable? getMainImage();
-    method public final android.widget.ImageView? getMainImageView();
-    method public CharSequence? getTitleText();
-    method public void setBadgeImage(android.graphics.drawable.Drawable?);
-    method public void setContentText(CharSequence?);
-    method public void setInfoAreaBackground(android.graphics.drawable.Drawable?);
-    method public void setInfoAreaBackgroundColor(@ColorInt int);
-    method public void setMainImage(android.graphics.drawable.Drawable?);
-    method public void setMainImage(android.graphics.drawable.Drawable?, boolean);
-    method public void setMainImageAdjustViewBounds(boolean);
-    method public void setMainImageDimensions(int, int);
-    method public void setMainImageScaleType(android.widget.ImageView.ScaleType);
-    method public void setTitleText(CharSequence?);
-    field public static final int CARD_TYPE_FLAG_CONTENT = 2; // 0x2
-    field public static final int CARD_TYPE_FLAG_ICON_LEFT = 8; // 0x8
-    field public static final int CARD_TYPE_FLAG_ICON_RIGHT = 4; // 0x4
-    field public static final int CARD_TYPE_FLAG_IMAGE_ONLY = 0; // 0x0
-    field public static final int CARD_TYPE_FLAG_TITLE = 1; // 0x1
-  }
-
-  public interface ImeKeyMonitor {
-    method public void setImeKeyListener(androidx.leanback.widget.ImeKeyMonitor.ImeKeyListener!);
-  }
-
-  public static interface ImeKeyMonitor.ImeKeyListener {
-    method public boolean onKeyPreIme(android.widget.EditText!, int, android.view.KeyEvent!);
-  }
-
-  public class ItemBridgeAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter implements androidx.leanback.widget.FacetProviderAdapter {
-    ctor public ItemBridgeAdapter();
-    ctor public ItemBridgeAdapter(androidx.leanback.widget.ObjectAdapter!);
-    ctor public ItemBridgeAdapter(androidx.leanback.widget.ObjectAdapter!, androidx.leanback.widget.PresenterSelector!);
-    method public void clear();
-    method public androidx.leanback.widget.FacetProvider! getFacetProvider(int);
-    method public int getItemCount();
-    method public java.util.ArrayList<androidx.leanback.widget.Presenter!>! getPresenterMapper();
-    method public androidx.leanback.widget.ItemBridgeAdapter.Wrapper! getWrapper();
-    method protected void onAddPresenter(androidx.leanback.widget.Presenter!, int);
-    method protected void onAttachedToWindow(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method protected void onBind(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public final void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int);
-    method public final void onBindViewHolder(androidx.recyclerview.widget.RecyclerView.ViewHolder!, int, java.util.List!);
-    method protected void onCreate(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public final androidx.recyclerview.widget.RecyclerView.ViewHolder! onCreateViewHolder(android.view.ViewGroup!, int);
-    method protected void onDetachedFromWindow(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public final boolean onFailedToRecycleView(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method protected void onUnbind(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public final void onViewAttachedToWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void onViewDetachedFromWindow(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public final void onViewRecycled(androidx.recyclerview.widget.RecyclerView.ViewHolder!);
-    method public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public void setAdapterListener(androidx.leanback.widget.ItemBridgeAdapter.AdapterListener!);
-    method public void setPresenter(androidx.leanback.widget.PresenterSelector!);
-    method public void setPresenterMapper(java.util.ArrayList<androidx.leanback.widget.Presenter!>!);
-    method public void setWrapper(androidx.leanback.widget.ItemBridgeAdapter.Wrapper!);
-  }
-
-  public static class ItemBridgeAdapter.AdapterListener {
-    ctor public ItemBridgeAdapter.AdapterListener();
-    method public void onAddPresenter(androidx.leanback.widget.Presenter!, int);
-    method public void onAttachedToWindow(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public void onBind(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public void onBind(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!, java.util.List!);
-    method public void onCreate(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public void onDetachedFromWindow(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-    method public void onUnbind(androidx.leanback.widget.ItemBridgeAdapter.ViewHolder!);
-  }
-
-  public static class ItemBridgeAdapter.ViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements androidx.leanback.widget.FacetProvider {
-    method public final Object! getExtraObject();
-    method public Object! getFacet(Class<?>!);
-    method public final Object! getItem();
-    method public final androidx.leanback.widget.Presenter! getPresenter();
-    method public final androidx.leanback.widget.Presenter.ViewHolder! getViewHolder();
-    method public void setExtraObject(Object!);
-  }
-
-  public abstract static class ItemBridgeAdapter.Wrapper {
-    ctor public ItemBridgeAdapter.Wrapper();
-    method public abstract android.view.View! createWrapper(android.view.View!);
-    method public abstract void wrap(android.view.View!, android.view.View!);
-  }
-
-  public class ItemBridgeAdapterShadowOverlayWrapper extends androidx.leanback.widget.ItemBridgeAdapter.Wrapper {
-    ctor public ItemBridgeAdapterShadowOverlayWrapper(androidx.leanback.widget.ShadowOverlayHelper!);
-    method public android.view.View! createWrapper(android.view.View!);
-    method public void wrap(android.view.View!, android.view.View!);
-  }
-
-  public class ListRow extends androidx.leanback.widget.Row {
-    ctor public ListRow(androidx.leanback.widget.HeaderItem!, androidx.leanback.widget.ObjectAdapter!);
-    ctor public ListRow(androidx.leanback.widget.ObjectAdapter!);
-    ctor public ListRow(long, androidx.leanback.widget.HeaderItem!, androidx.leanback.widget.ObjectAdapter!);
-    method public final androidx.leanback.widget.ObjectAdapter! getAdapter();
-    method public CharSequence! getContentDescription();
-    method public void setContentDescription(CharSequence!);
-  }
-
-  public final class ListRowHoverCardView extends android.widget.LinearLayout {
-    ctor public ListRowHoverCardView(android.content.Context!);
-    ctor public ListRowHoverCardView(android.content.Context!, android.util.AttributeSet!);
-    ctor public ListRowHoverCardView(android.content.Context!, android.util.AttributeSet!, int);
-    method public CharSequence! getDescription();
-    method public CharSequence! getTitle();
-    method public void setDescription(CharSequence!);
-    method public void setTitle(CharSequence!);
-  }
-
-  public class ListRowPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor public ListRowPresenter();
-    ctor public ListRowPresenter(int);
-    ctor public ListRowPresenter(int, boolean);
-    method protected void applySelectLevelToChild(androidx.leanback.widget.ListRowPresenter.ViewHolder!, android.view.View!);
-    method public final boolean areChildRoundedCornersEnabled();
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method protected androidx.leanback.widget.ShadowOverlayHelper.Options! createShadowOverlayOptions();
-    method public final void enableChildRoundedCorners(boolean);
-    method public int getExpandedRowHeight();
-    method public final int getFocusZoomFactor();
-    method public final androidx.leanback.widget.PresenterSelector! getHoverCardPresenterSelector();
-    method public int getRecycledPoolSize(androidx.leanback.widget.Presenter!);
-    method public int getRowHeight();
-    method public final boolean getShadowEnabled();
-    method @Deprecated public final int getZoomFactor();
-    method public final boolean isFocusDimmerUsed();
-    method public final boolean isKeepChildForeground();
-    method public boolean isUsingDefaultListSelectEffect();
-    method public final boolean isUsingDefaultSelectEffect();
-    method public boolean isUsingDefaultShadow();
-    method public boolean isUsingOutlineClipping(android.content.Context!);
-    method public boolean isUsingZOrder(android.content.Context!);
-    method public void setExpandedRowHeight(int);
-    method public final void setHoverCardPresenterSelector(androidx.leanback.widget.PresenterSelector!);
-    method public final void setKeepChildForeground(boolean);
-    method public void setNumRows(int);
-    method public void setRecycledPoolSize(androidx.leanback.widget.Presenter!, int);
-    method public void setRowHeight(int);
-    method public final void setShadowEnabled(boolean);
-  }
-
-  public static class ListRowPresenter.SelectItemViewHolderTask extends androidx.leanback.widget.Presenter.ViewHolderTask {
-    ctor public ListRowPresenter.SelectItemViewHolderTask(int);
-    method public int getItemPosition();
-    method public androidx.leanback.widget.Presenter.ViewHolderTask? getItemTask();
-    method public boolean isSmoothScroll();
-    method public void setItemPosition(int);
-    method public void setItemTask(androidx.leanback.widget.Presenter.ViewHolderTask?);
-    method public void setSmoothScroll(boolean);
-  }
-
-  public static class ListRowPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor public ListRowPresenter.ViewHolder(android.view.View, androidx.leanback.widget.HorizontalGridView, androidx.leanback.widget.ListRowPresenter);
-    method public final androidx.leanback.widget.ItemBridgeAdapter getBridgeAdapter();
-    method public final androidx.leanback.widget.HorizontalGridView getGridView();
-    method public androidx.leanback.widget.Presenter.ViewHolder? getItemViewHolder(int);
-    method public final androidx.leanback.widget.ListRowPresenter getListRowPresenter();
-    method public int getSelectedPosition();
-  }
-
-  public final class ListRowView extends android.widget.LinearLayout {
-    ctor public ListRowView(android.content.Context!);
-    ctor public ListRowView(android.content.Context!, android.util.AttributeSet!);
-    ctor public ListRowView(android.content.Context!, android.util.AttributeSet!, int);
-    method public androidx.leanback.widget.HorizontalGridView! getGridView();
-  }
-
-  public interface MultiActionsProvider {
-    method public androidx.leanback.widget.MultiActionsProvider.MultiAction![]! getActions();
-  }
-
-  public static class MultiActionsProvider.MultiAction {
-    ctor public MultiActionsProvider.MultiAction(long);
-    method public android.graphics.drawable.Drawable! getCurrentDrawable();
-    method public android.graphics.drawable.Drawable![]! getDrawables();
-    method public long getId();
-    method public int getIndex();
-    method public void incrementIndex();
-    method public void setDrawables(android.graphics.drawable.Drawable![]!);
-    method public void setIndex(int);
-  }
-
-  public abstract class ObjectAdapter {
-    ctor public ObjectAdapter();
-    ctor public ObjectAdapter(androidx.leanback.widget.Presenter);
-    ctor public ObjectAdapter(androidx.leanback.widget.PresenterSelector);
-    method public abstract Object? get(int);
-    method public long getId(int);
-    method public final androidx.leanback.widget.Presenter? getPresenter(Object);
-    method public final androidx.leanback.widget.PresenterSelector getPresenterSelector();
-    method public final boolean hasStableIds();
-    method public boolean isImmediateNotifySupported();
-    method protected final void notifyChanged();
-    method protected final void notifyItemMoved(int, int);
-    method public final void notifyItemRangeChanged(int, int);
-    method public final void notifyItemRangeChanged(int, int, Object?);
-    method protected final void notifyItemRangeInserted(int, int);
-    method protected final void notifyItemRangeRemoved(int, int);
-    method protected void onHasStableIdsChanged();
-    method protected void onPresenterSelectorChanged();
-    method public final void registerObserver(androidx.leanback.widget.ObjectAdapter.DataObserver);
-    method public final void setHasStableIds(boolean);
-    method public final void setPresenterSelector(androidx.leanback.widget.PresenterSelector);
-    method public abstract int size();
-    method public final void unregisterAllObservers();
-    method public final void unregisterObserver(androidx.leanback.widget.ObjectAdapter.DataObserver);
-    field public static final int NO_ID = -1; // 0xffffffff
-  }
-
-  public abstract static class ObjectAdapter.DataObserver {
-    ctor public ObjectAdapter.DataObserver();
-    method public void onChanged();
-    method public void onItemMoved(int, int);
-    method public void onItemRangeChanged(int, int);
-    method public void onItemRangeChanged(int, int, Object?);
-    method public void onItemRangeInserted(int, int);
-    method public void onItemRangeRemoved(int, int);
-  }
-
-  public interface OnActionClickedListener {
-    method public void onActionClicked(androidx.leanback.widget.Action);
-  }
-
-  public interface OnItemViewClickedListener extends androidx.leanback.widget.BaseOnItemViewClickedListener<androidx.leanback.widget.Row> {
-  }
-
-  public interface OnItemViewSelectedListener extends androidx.leanback.widget.BaseOnItemViewSelectedListener<androidx.leanback.widget.Row> {
-  }
-
-  public class PageRow extends androidx.leanback.widget.Row {
-    ctor public PageRow(androidx.leanback.widget.HeaderItem?);
-    method public final boolean isRenderedAsRowView();
-  }
-
-  public abstract class Parallax<PropertyT extends android.util.Property> {
-    ctor public Parallax();
-    method public androidx.leanback.widget.ParallaxEffect! addEffect(androidx.leanback.widget.Parallax.PropertyMarkerValue!...);
-    method public final PropertyT! addProperty(String!);
-    method public abstract PropertyT! createProperty(String!, int);
-    method public java.util.List<androidx.leanback.widget.ParallaxEffect!>! getEffects();
-    method public abstract float getMaxValue();
-    method public final java.util.List<PropertyT!>! getProperties();
-    method public void removeAllEffects();
-    method public void removeEffect(androidx.leanback.widget.ParallaxEffect!);
-    method @CallSuper public void updateValues();
-  }
-
-  public static class Parallax.FloatProperty extends android.util.Property<androidx.leanback.widget.Parallax,java.lang.Float> {
-    ctor public Parallax.FloatProperty(String!, int);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! at(float, float);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atAbsolute(float);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atFraction(float);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atMax();
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atMin();
-    method public final Float! get(androidx.leanback.widget.Parallax!);
-    method public final int getIndex();
-    method public final float getValue(androidx.leanback.widget.Parallax!);
-    method public final void set(androidx.leanback.widget.Parallax!, Float!);
-    method public final void setValue(androidx.leanback.widget.Parallax!, float);
-    field public static final float UNKNOWN_AFTER = 3.4028235E38f;
-    field public static final float UNKNOWN_BEFORE = -3.4028235E38f;
-  }
-
-  public static class Parallax.IntProperty extends android.util.Property<androidx.leanback.widget.Parallax,java.lang.Integer> {
-    ctor public Parallax.IntProperty(String!, int);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! at(int, float);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atAbsolute(int);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atFraction(float);
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atMax();
-    method public final androidx.leanback.widget.Parallax.PropertyMarkerValue! atMin();
-    method public final Integer! get(androidx.leanback.widget.Parallax!);
-    method public final int getIndex();
-    method public final int getValue(androidx.leanback.widget.Parallax!);
-    method public final void set(androidx.leanback.widget.Parallax!, Integer!);
-    method public final void setValue(androidx.leanback.widget.Parallax!, int);
-    field public static final int UNKNOWN_AFTER = 2147483647; // 0x7fffffff
-    field public static final int UNKNOWN_BEFORE = -2147483648; // 0x80000000
-  }
-
-  public static class Parallax.PropertyMarkerValue<PropertyT> {
-    ctor public Parallax.PropertyMarkerValue(PropertyT!);
-    method public PropertyT! getProperty();
-  }
-
-  public abstract class ParallaxEffect {
-    method public final void addTarget(androidx.leanback.widget.ParallaxTarget!);
-    method public final java.util.List<androidx.leanback.widget.Parallax.PropertyMarkerValue!>! getPropertyRanges();
-    method public final java.util.List<androidx.leanback.widget.ParallaxTarget!>! getTargets();
-    method public final void performMapping(androidx.leanback.widget.Parallax!);
-    method public final void removeTarget(androidx.leanback.widget.ParallaxTarget!);
-    method public final void setPropertyRanges(androidx.leanback.widget.Parallax.PropertyMarkerValue!...);
-    method public final androidx.leanback.widget.ParallaxEffect! target(androidx.leanback.widget.ParallaxTarget!);
-    method public final androidx.leanback.widget.ParallaxEffect! target(Object!, android.animation.PropertyValuesHolder!);
-    method public final <T, V extends java.lang.Number> androidx.leanback.widget.ParallaxEffect! target(T!, android.util.Property<T!,V!>!);
-  }
-
-  public abstract class ParallaxTarget {
-    ctor public ParallaxTarget();
-    method public void directUpdate(Number!);
-    method public boolean isDirectMapping();
-    method public void update(float);
-  }
-
-  public static final class ParallaxTarget.DirectPropertyTarget<T extends java.lang.Object, V extends java.lang.Number> extends androidx.leanback.widget.ParallaxTarget {
-    ctor public ParallaxTarget.DirectPropertyTarget(Object!, android.util.Property<T!,V!>!);
-  }
-
-  public static final class ParallaxTarget.PropertyValuesHolderTarget extends androidx.leanback.widget.ParallaxTarget {
-    ctor public ParallaxTarget.PropertyValuesHolderTarget(Object!, android.animation.PropertyValuesHolder!);
-  }
-
-  public class PlaybackControlsRow extends androidx.leanback.widget.Row {
-    ctor public PlaybackControlsRow();
-    ctor public PlaybackControlsRow(Object!);
-    method public androidx.leanback.widget.Action! getActionForKeyCode(androidx.leanback.widget.ObjectAdapter!, int);
-    method public androidx.leanback.widget.Action! getActionForKeyCode(int);
-    method public long getBufferedPosition();
-    method @Deprecated public int getBufferedProgress();
-    method @Deprecated public long getBufferedProgressLong();
-    method public long getCurrentPosition();
-    method @Deprecated public int getCurrentTime();
-    method @Deprecated public long getCurrentTimeLong();
-    method public long getDuration();
-    method public final android.graphics.drawable.Drawable! getImageDrawable();
-    method public final Object! getItem();
-    method public final androidx.leanback.widget.ObjectAdapter! getPrimaryActionsAdapter();
-    method public final androidx.leanback.widget.ObjectAdapter! getSecondaryActionsAdapter();
-    method @Deprecated public int getTotalTime();
-    method @Deprecated public long getTotalTimeLong();
-    method public void setBufferedPosition(long);
-    method @Deprecated public void setBufferedProgress(int);
-    method @Deprecated public void setBufferedProgressLong(long);
-    method public void setCurrentPosition(long);
-    method @Deprecated public void setCurrentTime(int);
-    method @Deprecated public void setCurrentTimeLong(long);
-    method public void setDuration(long);
-    method public final void setImageBitmap(android.content.Context!, android.graphics.Bitmap!);
-    method public final void setImageDrawable(android.graphics.drawable.Drawable!);
-    method public void setOnPlaybackProgressChangedListener(androidx.leanback.widget.PlaybackControlsRow.OnPlaybackProgressCallback!);
-    method public final void setPrimaryActionsAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method public final void setSecondaryActionsAdapter(androidx.leanback.widget.ObjectAdapter!);
-    method @Deprecated public void setTotalTime(int);
-    method @Deprecated public void setTotalTimeLong(long);
-  }
-
-  public static class PlaybackControlsRow.ClosedCaptioningAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.ClosedCaptioningAction(android.content.Context!);
-    ctor public PlaybackControlsRow.ClosedCaptioningAction(android.content.Context!, int);
-    field public static final int INDEX_OFF = 0; // 0x0
-    field public static final int INDEX_ON = 1; // 0x1
-    field @Deprecated public static final int OFF = 0; // 0x0
-    field @Deprecated public static final int ON = 1; // 0x1
-  }
-
-  public static class PlaybackControlsRow.FastForwardAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.FastForwardAction(android.content.Context!);
-    ctor public PlaybackControlsRow.FastForwardAction(android.content.Context!, int);
-  }
-
-  public static class PlaybackControlsRow.HighQualityAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.HighQualityAction(android.content.Context!);
-    ctor public PlaybackControlsRow.HighQualityAction(android.content.Context!, int);
-    field public static final int INDEX_OFF = 0; // 0x0
-    field public static final int INDEX_ON = 1; // 0x1
-    field @Deprecated public static final int OFF = 0; // 0x0
-    field @Deprecated public static final int ON = 1; // 0x1
-  }
-
-  public static class PlaybackControlsRow.MoreActions extends androidx.leanback.widget.Action {
-    ctor public PlaybackControlsRow.MoreActions(android.content.Context!);
-  }
-
-  public abstract static class PlaybackControlsRow.MultiAction extends androidx.leanback.widget.Action {
-    ctor public PlaybackControlsRow.MultiAction(int);
-    method public int getActionCount();
-    method public android.graphics.drawable.Drawable! getDrawable(int);
-    method public int getIndex();
-    method public String! getLabel(int);
-    method public String! getSecondaryLabel(int);
-    method public void nextIndex();
-    method public void setDrawables(android.graphics.drawable.Drawable![]!);
-    method public void setIndex(int);
-    method public void setLabels(String![]!);
-    method public void setSecondaryLabels(String![]!);
-  }
-
-  public static class PlaybackControlsRow.OnPlaybackProgressCallback {
-    ctor public PlaybackControlsRow.OnPlaybackProgressCallback();
-    method public void onBufferedPositionChanged(androidx.leanback.widget.PlaybackControlsRow!, long);
-    method public void onCurrentPositionChanged(androidx.leanback.widget.PlaybackControlsRow!, long);
-    method public void onDurationChanged(androidx.leanback.widget.PlaybackControlsRow!, long);
-  }
-
-  public static class PlaybackControlsRow.PictureInPictureAction extends androidx.leanback.widget.Action {
-    ctor public PlaybackControlsRow.PictureInPictureAction(android.content.Context!);
-  }
-
-  public static class PlaybackControlsRow.PlayPauseAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.PlayPauseAction(android.content.Context!);
-    field public static final int INDEX_PAUSE = 1; // 0x1
-    field public static final int INDEX_PLAY = 0; // 0x0
-    field @Deprecated public static final int PAUSE = 1; // 0x1
-    field @Deprecated public static final int PLAY = 0; // 0x0
-  }
-
-  public static class PlaybackControlsRow.RepeatAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.RepeatAction(android.content.Context!);
-    ctor public PlaybackControlsRow.RepeatAction(android.content.Context!, int);
-    ctor public PlaybackControlsRow.RepeatAction(android.content.Context!, int, int);
-    field @Deprecated public static final int ALL = 1; // 0x1
-    field public static final int INDEX_ALL = 1; // 0x1
-    field public static final int INDEX_NONE = 0; // 0x0
-    field public static final int INDEX_ONE = 2; // 0x2
-    field @Deprecated public static final int NONE = 0; // 0x0
-    field @Deprecated public static final int ONE = 2; // 0x2
-  }
-
-  public static class PlaybackControlsRow.RewindAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.RewindAction(android.content.Context!);
-    ctor public PlaybackControlsRow.RewindAction(android.content.Context!, int);
-  }
-
-  public static class PlaybackControlsRow.ShuffleAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.ShuffleAction(android.content.Context!);
-    ctor public PlaybackControlsRow.ShuffleAction(android.content.Context!, int);
-    field public static final int INDEX_OFF = 0; // 0x0
-    field public static final int INDEX_ON = 1; // 0x1
-    field @Deprecated public static final int OFF = 0; // 0x0
-    field @Deprecated public static final int ON = 1; // 0x1
-  }
-
-  public static class PlaybackControlsRow.SkipNextAction extends androidx.leanback.widget.Action {
-    ctor public PlaybackControlsRow.SkipNextAction(android.content.Context!);
-  }
-
-  public static class PlaybackControlsRow.SkipPreviousAction extends androidx.leanback.widget.Action {
-    ctor public PlaybackControlsRow.SkipPreviousAction(android.content.Context!);
-  }
-
-  public abstract static class PlaybackControlsRow.ThumbsAction extends androidx.leanback.widget.PlaybackControlsRow.MultiAction {
-    ctor public PlaybackControlsRow.ThumbsAction(int, android.content.Context!, int, int);
-    field public static final int INDEX_OUTLINE = 1; // 0x1
-    field public static final int INDEX_SOLID = 0; // 0x0
-    field @Deprecated public static final int OUTLINE = 1; // 0x1
-    field @Deprecated public static final int SOLID = 0; // 0x0
-  }
-
-  public static class PlaybackControlsRow.ThumbsDownAction extends androidx.leanback.widget.PlaybackControlsRow.ThumbsAction {
-    ctor public PlaybackControlsRow.ThumbsDownAction(android.content.Context!);
-  }
-
-  public static class PlaybackControlsRow.ThumbsUpAction extends androidx.leanback.widget.PlaybackControlsRow.ThumbsAction {
-    ctor public PlaybackControlsRow.ThumbsUpAction(android.content.Context!);
-  }
-
-  public class PlaybackControlsRowPresenter extends androidx.leanback.widget.PlaybackRowPresenter {
-    ctor public PlaybackControlsRowPresenter();
-    ctor public PlaybackControlsRowPresenter(androidx.leanback.widget.Presenter?);
-    method public boolean areSecondaryActionsHidden();
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder createRowViewHolder(android.view.ViewGroup);
-    method @ColorInt public int getBackgroundColor();
-    method public androidx.leanback.widget.OnActionClickedListener? getOnActionClickedListener();
-    method @ColorInt public int getProgressColor();
-    method public void setBackgroundColor(@ColorInt int);
-    method public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener?);
-    method public void setProgressColor(@ColorInt int);
-    method public void setSecondaryActionsHidden(boolean);
-    method public void showBottomSpace(androidx.leanback.widget.PlaybackControlsRowPresenter.ViewHolder, boolean);
-    method public void showPrimaryActions(androidx.leanback.widget.PlaybackControlsRowPresenter.ViewHolder);
-  }
-
-  public class PlaybackControlsRowPresenter.ViewHolder extends androidx.leanback.widget.PlaybackRowPresenter.ViewHolder {
-    field public final androidx.leanback.widget.Presenter.ViewHolder! mDescriptionViewHolder;
-  }
-
-  public abstract class PlaybackRowPresenter extends androidx.leanback.widget.RowPresenter {
-    ctor public PlaybackRowPresenter();
-    method public void onReappear(androidx.leanback.widget.RowPresenter.ViewHolder);
-  }
-
-  public static class PlaybackRowPresenter.ViewHolder extends androidx.leanback.widget.RowPresenter.ViewHolder {
-    ctor public PlaybackRowPresenter.ViewHolder(android.view.View!);
-  }
-
-  public class PlaybackSeekDataProvider {
-    ctor public PlaybackSeekDataProvider();
-    method public long[]! getSeekPositions();
-    method public void getThumbnail(int, androidx.leanback.widget.PlaybackSeekDataProvider.ResultCallback!);
-    method public void reset();
-  }
-
-  public static class PlaybackSeekDataProvider.ResultCallback {
-    ctor public PlaybackSeekDataProvider.ResultCallback();
-    method public void onThumbnailLoaded(android.graphics.Bitmap!, int);
-  }
-
-  public interface PlaybackSeekUi {
-    method public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-  }
-
-  public static class PlaybackSeekUi.Client {
-    ctor public PlaybackSeekUi.Client();
-    method public androidx.leanback.widget.PlaybackSeekDataProvider! getPlaybackSeekDataProvider();
-    method public boolean isSeekEnabled();
-    method public void onSeekFinished(boolean);
-    method public void onSeekPositionChanged(long);
-    method public void onSeekStarted();
-  }
-
-  public class PlaybackTransportRowPresenter extends androidx.leanback.widget.PlaybackRowPresenter {
-    ctor public PlaybackTransportRowPresenter();
-    method protected androidx.leanback.widget.RowPresenter.ViewHolder! createRowViewHolder(android.view.ViewGroup!);
-    method public float getDefaultSeekIncrement();
-    method public androidx.leanback.widget.OnActionClickedListener! getOnActionClickedListener();
-    method @ColorInt public int getProgressColor();
-    method @ColorInt public int getSecondaryProgressColor();
-    method protected void onProgressBarClicked(androidx.leanback.widget.PlaybackTransportRowPresenter.ViewHolder!);
-    method public void setDefaultSeekIncrement(float);
-    method public void setDescriptionPresenter(androidx.leanback.widget.Presenter!);
-    method public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method public void setProgressColor(@ColorInt int);
-    method public void setSecondaryProgressColor(@ColorInt int);
-  }
-
-  public class PlaybackTransportRowPresenter.ViewHolder extends androidx.leanback.widget.PlaybackRowPresenter.ViewHolder implements androidx.leanback.widget.PlaybackSeekUi {
-    ctor public PlaybackTransportRowPresenter.ViewHolder(android.view.View!, androidx.leanback.widget.Presenter!);
-    method public final android.widget.TextView! getCurrentPositionView();
-    method public final androidx.leanback.widget.Presenter.ViewHolder! getDescriptionViewHolder();
-    method public final android.widget.TextView! getDurationView();
-    method protected void onSetCurrentPositionLabel(long);
-    method protected void onSetDurationLabel(long);
-    method public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-  }
-
-  public abstract class Presenter implements androidx.leanback.widget.FacetProvider {
-    ctor public Presenter();
-    method protected static void cancelAnimationsRecursive(android.view.View!);
-    method public final Object! getFacet(Class<?>!);
-    method public abstract void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object, java.util.List<java.lang.Object!>);
-    method public abstract androidx.leanback.widget.Presenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public abstract void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void onViewAttachedToWindow(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void onViewDetachedFromWindow(androidx.leanback.widget.Presenter.ViewHolder);
-    method public final void setFacet(Class<?>!, Object!);
-    method public void setOnClickListener(androidx.leanback.widget.Presenter.ViewHolder!, android.view.View.OnClickListener!);
-  }
-
-  public static class Presenter.ViewHolder implements androidx.leanback.widget.FacetProvider {
-    ctor public Presenter.ViewHolder(android.view.View!);
-    method public final Object! getFacet(Class<?>!);
-    method public final void setFacet(Class<?>!, Object!);
-    field public final android.view.View! view;
-  }
-
-  public abstract static class Presenter.ViewHolderTask {
-    ctor public Presenter.ViewHolderTask();
-    method public void run(androidx.leanback.widget.Presenter.ViewHolder!);
-  }
-
-  public abstract class PresenterSelector {
-    ctor public PresenterSelector();
-    method public abstract androidx.leanback.widget.Presenter? getPresenter(Object?);
-    method public androidx.leanback.widget.Presenter![]? getPresenters();
-  }
-
-  public abstract class PresenterSwitcher {
-    ctor public PresenterSwitcher();
-    method public void clear();
-    method public final android.view.ViewGroup! getParentViewGroup();
-    method public void init(android.view.ViewGroup!, androidx.leanback.widget.PresenterSelector!);
-    method protected abstract void insertView(android.view.View!);
-    method protected void onViewSelected(android.view.View!);
-    method public void select(Object!);
-    method protected void showView(android.view.View!, boolean);
-    method public void unselect();
-  }
-
-  public class RecyclerViewParallax extends androidx.leanback.widget.Parallax<androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty> {
-    ctor public RecyclerViewParallax();
-    method public androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty! createProperty(String!, int);
-    method public float getMaxValue();
-    method public androidx.recyclerview.widget.RecyclerView! getRecyclerView();
-    method public void setRecyclerView(androidx.recyclerview.widget.RecyclerView!);
-  }
-
-  public static final class RecyclerViewParallax.ChildPositionProperty extends androidx.leanback.widget.Parallax.IntProperty {
-    method public androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty! adapterPosition(int);
-    method public androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty! fraction(float);
-    method public int getAdapterPosition();
-    method public float getFraction();
-    method public int getOffset();
-    method public int getViewId();
-    method public androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty! offset(int);
-    method public androidx.leanback.widget.RecyclerViewParallax.ChildPositionProperty! viewId(int);
-  }
-
-  public class Row {
-    ctor public Row();
-    ctor public Row(androidx.leanback.widget.HeaderItem!);
-    ctor public Row(long, androidx.leanback.widget.HeaderItem!);
-    method public final androidx.leanback.widget.HeaderItem! getHeaderItem();
-    method public final long getId();
-    method public boolean isRenderedAsRowView();
-    method public final void setHeaderItem(androidx.leanback.widget.HeaderItem!);
-    method public final void setId(long);
-  }
-
-  public class RowHeaderPresenter extends androidx.leanback.widget.Presenter {
-    ctor public RowHeaderPresenter();
-    method protected static float getFontDescent(android.widget.TextView, android.graphics.Paint);
-    method public int getSpaceUnderBaseline(androidx.leanback.widget.RowHeaderPresenter.ViewHolder);
-    method public boolean isNullItemVisibilityGone();
-    method public void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public androidx.leanback.widget.Presenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method protected void onSelectLevelChanged(androidx.leanback.widget.RowHeaderPresenter.ViewHolder);
-    method public void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void setNullItemVisibilityGone(boolean);
-    method public final void setSelectLevel(androidx.leanback.widget.RowHeaderPresenter.ViewHolder, float);
-  }
-
-  public static class RowHeaderPresenter.ViewHolder extends androidx.leanback.widget.Presenter.ViewHolder {
-    ctor public RowHeaderPresenter.ViewHolder(android.view.View);
-    method public final float getSelectLevel();
-  }
-
-  public final class RowHeaderView extends android.widget.TextView {
-    ctor public RowHeaderView(android.content.Context!);
-    ctor public RowHeaderView(android.content.Context!, android.util.AttributeSet!);
-    ctor public RowHeaderView(android.content.Context!, android.util.AttributeSet!, int);
-  }
-
-  public abstract class RowPresenter extends androidx.leanback.widget.Presenter {
-    ctor public RowPresenter();
-    method protected abstract androidx.leanback.widget.RowPresenter.ViewHolder createRowViewHolder(android.view.ViewGroup);
-    method protected void dispatchItemSelectedListener(androidx.leanback.widget.RowPresenter.ViewHolder!, boolean);
-    method public void freeze(androidx.leanback.widget.RowPresenter.ViewHolder, boolean);
-    method public final androidx.leanback.widget.RowHeaderPresenter! getHeaderPresenter();
-    method public final androidx.leanback.widget.RowPresenter.ViewHolder! getRowViewHolder(androidx.leanback.widget.Presenter.ViewHolder!);
-    method public final boolean getSelectEffectEnabled();
-    method public final float getSelectLevel(androidx.leanback.widget.Presenter.ViewHolder!);
-    method public final int getSyncActivatePolicy();
-    method protected void initializeRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method protected boolean isClippingChildren();
-    method public boolean isUsingDefaultSelectEffect();
-    method protected void onBindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder, Object);
-    method public final void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public final androidx.leanback.widget.Presenter.ViewHolder! onCreateViewHolder(android.view.ViewGroup!);
-    method protected void onRowViewAttachedToWindow(androidx.leanback.widget.RowPresenter.ViewHolder);
-    method protected void onRowViewDetachedFromWindow(androidx.leanback.widget.RowPresenter.ViewHolder);
-    method protected void onRowViewExpanded(androidx.leanback.widget.RowPresenter.ViewHolder!, boolean);
-    method protected void onRowViewSelected(androidx.leanback.widget.RowPresenter.ViewHolder, boolean);
-    method protected void onSelectLevelChanged(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method protected void onUnbindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder);
-    method public final void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-    method public final void onViewAttachedToWindow(androidx.leanback.widget.Presenter.ViewHolder);
-    method public final void onViewDetachedFromWindow(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void setEntranceTransitionState(androidx.leanback.widget.RowPresenter.ViewHolder, boolean);
-    method public final void setHeaderPresenter(androidx.leanback.widget.RowHeaderPresenter!);
-    method public final void setRowViewExpanded(androidx.leanback.widget.Presenter.ViewHolder!, boolean);
-    method public final void setRowViewSelected(androidx.leanback.widget.Presenter.ViewHolder!, boolean);
-    method public final void setSelectEffectEnabled(boolean);
-    method public final void setSelectLevel(androidx.leanback.widget.Presenter.ViewHolder!, float);
-    method public final void setSyncActivatePolicy(int);
-    field public static final int SYNC_ACTIVATED_CUSTOM = 0; // 0x0
-    field public static final int SYNC_ACTIVATED_TO_EXPANDED = 1; // 0x1
-    field public static final int SYNC_ACTIVATED_TO_EXPANDED_AND_SELECTED = 3; // 0x3
-    field public static final int SYNC_ACTIVATED_TO_SELECTED = 2; // 0x2
-  }
-
-  public static class RowPresenter.ViewHolder extends androidx.leanback.widget.Presenter.ViewHolder {
-    ctor public RowPresenter.ViewHolder(android.view.View!);
-    method public final androidx.leanback.widget.RowHeaderPresenter.ViewHolder! getHeaderViewHolder();
-    method public final androidx.leanback.widget.BaseOnItemViewClickedListener! getOnItemViewClickedListener();
-    method public final androidx.leanback.widget.BaseOnItemViewSelectedListener! getOnItemViewSelectedListener();
-    method public android.view.View.OnKeyListener! getOnKeyListener();
-    method public final androidx.leanback.widget.Row! getRow();
-    method public final Object! getRowObject();
-    method public final float getSelectLevel();
-    method public Object? getSelectedItem();
-    method public androidx.leanback.widget.Presenter.ViewHolder? getSelectedItemViewHolder();
-    method public final boolean isExpanded();
-    method public final boolean isSelected();
-    method public final void setActivated(boolean);
-    method public final void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
-    method public final void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
-    method public void setOnKeyListener(android.view.View.OnKeyListener!);
-    method public final void syncActivatedStatus(android.view.View!);
-    field protected final androidx.leanback.graphics.ColorOverlayDimmer! mColorDimmer;
-  }
-
-  public class SearchBar extends android.widget.RelativeLayout {
-    ctor public SearchBar(android.content.Context!);
-    ctor public SearchBar(android.content.Context!, android.util.AttributeSet!);
-    ctor public SearchBar(android.content.Context!, android.util.AttributeSet!, int);
-    method public void displayCompletions(android.view.inputmethod.CompletionInfo![]!);
-    method public void displayCompletions(java.util.List<java.lang.String!>!);
-    method public android.graphics.drawable.Drawable! getBadgeDrawable();
-    method public CharSequence! getHint();
-    method public String! getTitle();
-    method public boolean isRecognizing();
-    method public void setBadgeDrawable(android.graphics.drawable.Drawable!);
-    method public void setPermissionListener(androidx.leanback.widget.SearchBar.SearchBarPermissionListener!);
-    method public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setSearchAffordanceColorsInListening(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setSearchBarListener(androidx.leanback.widget.SearchBar.SearchBarListener!);
-    method public void setSearchQuery(String!);
-    method @Deprecated public void setSpeechRecognitionCallback(androidx.leanback.widget.SpeechRecognitionCallback!);
-    method public void setSpeechRecognizer(android.speech.SpeechRecognizer!);
-    method public void setTitle(String!);
-    method public void startRecognition();
-    method public void stopRecognition();
-  }
-
-  public static interface SearchBar.SearchBarListener {
-    method public void onKeyboardDismiss(String!);
-    method public void onSearchQueryChange(String!);
-    method public void onSearchQuerySubmit(String!);
-  }
-
-  public static interface SearchBar.SearchBarPermissionListener {
-    method public void requestAudioPermission();
-  }
-
-  public class SearchEditText extends android.widget.EditText {
-    ctor public SearchEditText(android.content.Context!);
-    ctor public SearchEditText(android.content.Context!, android.util.AttributeSet!);
-    ctor public SearchEditText(android.content.Context!, android.util.AttributeSet!, int);
-    method public static boolean isLayoutRtl(android.view.View!);
-    method public void reset();
-    method public void setFinalRecognizedText(CharSequence!);
-    method public void setOnKeyboardDismissListener(androidx.leanback.widget.SearchEditText.OnKeyboardDismissListener!);
-    method public void updateRecognizedText(String!, String!);
-    method public void updateRecognizedText(String!, java.util.List<java.lang.Float!>!);
-  }
-
-  public static interface SearchEditText.OnKeyboardDismissListener {
-    method public void onKeyboardDismiss();
-  }
-
-  public class SearchOrbView extends android.widget.FrameLayout implements android.view.View.OnClickListener {
-    ctor public SearchOrbView(android.content.Context);
-    ctor public SearchOrbView(android.content.Context, android.util.AttributeSet?);
-    ctor public SearchOrbView(android.content.Context, android.util.AttributeSet?, int);
-    method public void enableOrbColorAnimation(boolean);
-    method @ColorInt public int getOrbColor();
-    method public androidx.leanback.widget.SearchOrbView.Colors? getOrbColors();
-    method public android.graphics.drawable.Drawable? getOrbIcon();
-    method public void onClick(android.view.View!);
-    method public void setOnOrbClickedListener(android.view.View.OnClickListener?);
-    method public void setOrbColor(int);
-    method @Deprecated public void setOrbColor(@ColorInt int, @ColorInt int);
-    method public void setOrbColors(androidx.leanback.widget.SearchOrbView.Colors);
-    method public void setOrbIcon(android.graphics.drawable.Drawable);
-  }
-
-  public static class SearchOrbView.Colors {
-    ctor public SearchOrbView.Colors(@ColorInt int);
-    ctor public SearchOrbView.Colors(@ColorInt int, @ColorInt int);
-    ctor public SearchOrbView.Colors(@ColorInt int, @ColorInt int, @ColorInt int);
-    method public static int getBrightColor(int);
-    field @ColorInt public int brightColor;
-    field @ColorInt public int color;
-    field @ColorInt public int iconColor;
-  }
-
-  public class SectionRow extends androidx.leanback.widget.Row {
-    ctor public SectionRow(androidx.leanback.widget.HeaderItem!);
-    ctor public SectionRow(String!);
-    ctor public SectionRow(long, String!);
-    method public final boolean isRenderedAsRowView();
-  }
-
-  public class ShadowOverlayContainer extends android.widget.FrameLayout {
-    ctor public ShadowOverlayContainer(android.content.Context!);
-    ctor public ShadowOverlayContainer(android.content.Context!, android.util.AttributeSet!);
-    ctor public ShadowOverlayContainer(android.content.Context!, android.util.AttributeSet!, int);
-    method public int getShadowType();
-    method public android.view.View! getWrappedView();
-    method @Deprecated public void initialize(boolean, boolean);
-    method @Deprecated public void initialize(boolean, boolean, boolean);
-    method public static void prepareParentForShadow(android.view.ViewGroup!);
-    method public void setOverlayColor(@ColorInt int);
-    method public void setShadowFocusLevel(float);
-    method public static boolean supportsDynamicShadow();
-    method public static boolean supportsShadow();
-    method public void useDynamicShadow();
-    method public void useDynamicShadow(float, float);
-    method public void useStaticShadow();
-    method public void wrap(android.view.View!);
-    field public static final int SHADOW_DYNAMIC = 3; // 0x3
-    field public static final int SHADOW_NONE = 1; // 0x1
-    field public static final int SHADOW_STATIC = 2; // 0x2
-  }
-
-  public final class ShadowOverlayHelper {
-    method public androidx.leanback.widget.ShadowOverlayContainer! createShadowOverlayContainer(android.content.Context!);
-    method public int getShadowType();
-    method public boolean needsOverlay();
-    method public boolean needsRoundedCorner();
-    method public boolean needsWrapper();
-    method public void onViewCreated(android.view.View!);
-    method public void prepareParentForShadow(android.view.ViewGroup!);
-    method public static void setNoneWrapperOverlayColor(android.view.View!, int);
-    method public static void setNoneWrapperShadowFocusLevel(android.view.View!, float);
-    method public void setOverlayColor(android.view.View!, int);
-    method public void setShadowFocusLevel(android.view.View!, float);
-    method public static boolean supportsDynamicShadow();
-    method public static boolean supportsForeground();
-    method public static boolean supportsRoundedCorner();
-    method public static boolean supportsShadow();
-    field public static final int SHADOW_DYNAMIC = 3; // 0x3
-    field public static final int SHADOW_NONE = 1; // 0x1
-    field public static final int SHADOW_STATIC = 2; // 0x2
-  }
-
-  public static final class ShadowOverlayHelper.Builder {
-    ctor public ShadowOverlayHelper.Builder();
-    method public androidx.leanback.widget.ShadowOverlayHelper! build(android.content.Context!);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! keepForegroundDrawable(boolean);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! needsOverlay(boolean);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! needsRoundedCorner(boolean);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! needsShadow(boolean);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! options(androidx.leanback.widget.ShadowOverlayHelper.Options!);
-    method public androidx.leanback.widget.ShadowOverlayHelper.Builder! preferZOrder(boolean);
-  }
-
-  public static final class ShadowOverlayHelper.Options {
-    ctor public ShadowOverlayHelper.Options();
-    method public androidx.leanback.widget.ShadowOverlayHelper.Options! dynamicShadowZ(float, float);
-    method public float getDynamicShadowFocusedZ();
-    method public float getDynamicShadowUnfocusedZ();
-    method public int getRoundedCornerRadius();
-    method public androidx.leanback.widget.ShadowOverlayHelper.Options! roundedCornerRadius(int);
-    field public static final androidx.leanback.widget.ShadowOverlayHelper.Options! DEFAULT;
-  }
-
-  public final class SinglePresenterSelector extends androidx.leanback.widget.PresenterSelector {
-    ctor public SinglePresenterSelector(androidx.leanback.widget.Presenter);
-    method public androidx.leanback.widget.Presenter? getPresenter(Object?);
-  }
-
-  public class SparseArrayObjectAdapter extends androidx.leanback.widget.ObjectAdapter {
-    ctor public SparseArrayObjectAdapter();
-    ctor public SparseArrayObjectAdapter(androidx.leanback.widget.Presenter!);
-    ctor public SparseArrayObjectAdapter(androidx.leanback.widget.PresenterSelector!);
-    method public void clear();
-    method public void clear(int);
-    method public Object? get(int);
-    method public int indexOf(int);
-    method public int indexOf(Object!);
-    method public Object! lookup(int);
-    method public void notifyArrayItemRangeChanged(int, int);
-    method public void set(int, Object!);
-    method public int size();
-  }
-
-  public class SpeechOrbView extends androidx.leanback.widget.SearchOrbView {
-    ctor public SpeechOrbView(android.content.Context!);
-    ctor public SpeechOrbView(android.content.Context!, android.util.AttributeSet!);
-    ctor public SpeechOrbView(android.content.Context!, android.util.AttributeSet!, int);
-    method public void setListeningOrbColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setNotListeningOrbColors(androidx.leanback.widget.SearchOrbView.Colors!);
-    method public void setSoundLevel(int);
-    method public void showListening();
-    method public void showNotListening();
-  }
-
-  @Deprecated public interface SpeechRecognitionCallback {
-    method @Deprecated public void recognizeSpeech();
-  }
-
-  public class TitleHelper {
-    ctor public TitleHelper(android.view.ViewGroup!, android.view.View!);
-    method public androidx.leanback.widget.BrowseFrameLayout.OnFocusSearchListener! getOnFocusSearchListener();
-    method public android.view.ViewGroup! getSceneRoot();
-    method public android.view.View! getTitleView();
-    method public void showTitle(boolean);
-  }
-
-  public class TitleView extends android.widget.FrameLayout implements androidx.leanback.widget.TitleViewAdapter.Provider {
-    ctor public TitleView(android.content.Context);
-    ctor public TitleView(android.content.Context, android.util.AttributeSet?);
-    ctor public TitleView(android.content.Context, android.util.AttributeSet?, int);
-    method public void enableAnimation(boolean);
-    method public android.graphics.drawable.Drawable? getBadgeDrawable();
-    method public androidx.leanback.widget.SearchOrbView.Colors? getSearchAffordanceColors();
-    method public android.view.View getSearchAffordanceView();
-    method public CharSequence? getTitle();
-    method public androidx.leanback.widget.TitleViewAdapter getTitleViewAdapter();
-    method public void setBadgeDrawable(android.graphics.drawable.Drawable?);
-    method public void setOnSearchClickedListener(android.view.View.OnClickListener?);
-    method public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors);
-    method public void setTitle(CharSequence?);
-    method public void updateComponentsVisibility(int);
-  }
-
-  public abstract class TitleViewAdapter {
-    ctor public TitleViewAdapter();
-    method public android.graphics.drawable.Drawable! getBadgeDrawable();
-    method public androidx.leanback.widget.SearchOrbView.Colors! getSearchAffordanceColors();
-    method public abstract android.view.View! getSearchAffordanceView();
-    method public CharSequence! getTitle();
-    method public void setAnimationEnabled(boolean);
-    method public void setBadgeDrawable(android.graphics.drawable.Drawable!);
-    method public void setOnSearchClickedListener(android.view.View.OnClickListener!);
-    method public void setSearchAffordanceColors(androidx.leanback.widget.SearchOrbView.Colors);
-    method public void setTitle(CharSequence!);
-    method public void updateComponentsVisibility(int);
-    field public static final int BRANDING_VIEW_VISIBLE = 2; // 0x2
-    field public static final int FULL_VIEW_VISIBLE = 6; // 0x6
-    field public static final int SEARCH_VIEW_VISIBLE = 4; // 0x4
-  }
-
-  public static interface TitleViewAdapter.Provider {
-    method public androidx.leanback.widget.TitleViewAdapter! getTitleViewAdapter();
-  }
-
-  public class VerticalGridPresenter extends androidx.leanback.widget.Presenter {
-    ctor public VerticalGridPresenter();
-    ctor public VerticalGridPresenter(int);
-    ctor public VerticalGridPresenter(int, boolean);
-    method public final boolean areChildRoundedCornersEnabled();
-    method protected androidx.leanback.widget.VerticalGridPresenter.ViewHolder createGridViewHolder(android.view.ViewGroup);
-    method protected androidx.leanback.widget.ShadowOverlayHelper.Options createShadowOverlayOptions();
-    method public final void enableChildRoundedCorners(boolean);
-    method public final int getFocusZoomFactor();
-    method public final boolean getKeepChildForeground();
-    method public int getNumberOfColumns();
-    method public final androidx.leanback.widget.OnItemViewClickedListener? getOnItemViewClickedListener();
-    method public final androidx.leanback.widget.OnItemViewSelectedListener? getOnItemViewSelectedListener();
-    method public final boolean getShadowEnabled();
-    method protected void initializeGridViewHolder(androidx.leanback.widget.VerticalGridPresenter.ViewHolder);
-    method public final boolean isFocusDimmerUsed();
-    method public boolean isUsingDefaultShadow();
-    method public boolean isUsingZOrder(android.content.Context);
-    method public void onBindViewHolder(androidx.leanback.widget.Presenter.ViewHolder, Object?);
-    method public final androidx.leanback.widget.VerticalGridPresenter.ViewHolder onCreateViewHolder(android.view.ViewGroup);
-    method public void onUnbindViewHolder(androidx.leanback.widget.Presenter.ViewHolder);
-    method public void setEntranceTransitionState(androidx.leanback.widget.VerticalGridPresenter.ViewHolder, boolean);
-    method public final void setKeepChildForeground(boolean);
-    method public void setNumberOfColumns(int);
-    method public final void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener?);
-    method public final void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener?);
-    method public final void setShadowEnabled(boolean);
-  }
-
-  public static class VerticalGridPresenter.ViewHolder extends androidx.leanback.widget.Presenter.ViewHolder {
-    ctor public VerticalGridPresenter.ViewHolder(androidx.leanback.widget.VerticalGridView);
-    method public androidx.leanback.widget.VerticalGridView getGridView();
-  }
-
-}
-
-package androidx.leanback.widget.picker {
-
-  public class DatePicker extends androidx.leanback.widget.picker.Picker {
-    ctor public DatePicker(android.content.Context!, android.util.AttributeSet!);
-    ctor public DatePicker(android.content.Context!, android.util.AttributeSet!, int);
-    method public long getDate();
-    method public String! getDatePickerFormat();
-    method public long getMaxDate();
-    method public long getMinDate();
-    method public final void onColumnValueChanged(int, int);
-    method public void setDate(int, int, int, boolean);
-    method public void setDate(long);
-    method public void setDatePickerFormat(String!);
-    method public void setMaxDate(long);
-    method public void setMinDate(long);
-  }
-
-  public class Picker extends android.widget.FrameLayout {
-    ctor public Picker(android.content.Context, android.util.AttributeSet?);
-    ctor public Picker(android.content.Context, android.util.AttributeSet?, int);
-    method public void addOnValueChangedListener(androidx.leanback.widget.picker.Picker.PickerValueListener);
-    method public float getActivatedVisibleItemCount();
-    method public androidx.leanback.widget.picker.PickerColumn? getColumnAt(int);
-    method public int getColumnsCount();
-    method protected int getPickerItemHeightPixels();
-    method @LayoutRes public final int getPickerItemLayoutId();
-    method @IdRes public final int getPickerItemTextViewId();
-    method public int getSelectedColumn();
-    method @Deprecated public final CharSequence! getSeparator();
-    method public final java.util.List<java.lang.CharSequence!> getSeparators();
-    method public float getVisibleItemCount();
-    method public void onColumnValueChanged(int, int);
-    method public void removeOnValueChangedListener(androidx.leanback.widget.picker.Picker.PickerValueListener);
-    method public void setActivatedVisibleItemCount(float);
-    method public void setColumnAt(int, androidx.leanback.widget.picker.PickerColumn);
-    method public void setColumnValue(int, int, boolean);
-    method public void setColumns(java.util.List<androidx.leanback.widget.picker.PickerColumn!>);
-    method public final void setPickerItemLayoutId(@LayoutRes int);
-    method public final void setPickerItemTextViewId(@IdRes int);
-    method public void setSelectedColumn(int);
-    method public final void setSeparator(CharSequence);
-    method public final void setSeparators(java.util.List<java.lang.CharSequence!>);
-    method public void setVisibleItemCount(float);
-  }
-
-  public static interface Picker.PickerValueListener {
-    method public void onValueChanged(androidx.leanback.widget.picker.Picker, int);
-  }
-
-  public class PickerColumn {
-    ctor public PickerColumn();
-    method public int getCount();
-    method public int getCurrentValue();
-    method public CharSequence! getLabelFor(int);
-    method public String! getLabelFormat();
-    method public int getMaxValue();
-    method public int getMinValue();
-    method public CharSequence![]! getStaticLabels();
-    method public void setCurrentValue(int);
-    method public void setLabelFormat(String!);
-    method public void setMaxValue(int);
-    method public void setMinValue(int);
-    method public void setStaticLabels(CharSequence![]!);
-  }
-
-  public class PinPicker extends androidx.leanback.widget.picker.Picker {
-    ctor public PinPicker(android.content.Context!, android.util.AttributeSet!);
-    ctor public PinPicker(android.content.Context!, android.util.AttributeSet!, int);
-    method public String! getPin();
-    method public void resetPin();
-    method public void setNumberOfColumns(int);
-  }
-
-  public class TimePicker extends androidx.leanback.widget.picker.Picker {
-    ctor public TimePicker(android.content.Context!, android.util.AttributeSet!);
-    ctor public TimePicker(android.content.Context!, android.util.AttributeSet!, int);
-    method public int getHour();
-    method public int getMinute();
-    method public boolean is24Hour();
-    method public boolean isPm();
-    method public void setHour(@IntRange(from=0, to=23) int);
-    method public void setIs24Hour(boolean);
-    method public void setMinute(@IntRange(from=0, to=59) int);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-common-java8/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-common-java8/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/lifecycle/lifecycle-common-java8/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/lifecycle/lifecycle-common/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index db43346..0000000
--- a/lifecycle/lifecycle-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public interface DefaultLifecycleObserver extends androidx.lifecycle.LifecycleObserver {
-    method public default void onCreate(androidx.lifecycle.LifecycleOwner owner);
-    method public default void onDestroy(androidx.lifecycle.LifecycleOwner owner);
-    method public default void onPause(androidx.lifecycle.LifecycleOwner owner);
-    method public default void onResume(androidx.lifecycle.LifecycleOwner owner);
-    method public default void onStart(androidx.lifecycle.LifecycleOwner owner);
-    method public default void onStop(androidx.lifecycle.LifecycleOwner owner);
-  }
-
-  public abstract class Lifecycle {
-    ctor public Lifecycle();
-    method @MainThread public abstract void addObserver(androidx.lifecycle.LifecycleObserver observer);
-    method @MainThread public abstract androidx.lifecycle.Lifecycle.State getCurrentState();
-    method public kotlinx.coroutines.flow.StateFlow<androidx.lifecycle.Lifecycle.State> getCurrentStateFlow();
-    method @MainThread public abstract void removeObserver(androidx.lifecycle.LifecycleObserver observer);
-    property @MainThread public abstract androidx.lifecycle.Lifecycle.State currentState;
-    property public kotlinx.coroutines.flow.StateFlow<androidx.lifecycle.Lifecycle.State> currentStateFlow;
-  }
-
-  public enum Lifecycle.Event {
-    method public static final androidx.lifecycle.Lifecycle.Event? downFrom(androidx.lifecycle.Lifecycle.State state);
-    method public static final androidx.lifecycle.Lifecycle.Event? downTo(androidx.lifecycle.Lifecycle.State state);
-    method public final androidx.lifecycle.Lifecycle.State getTargetState();
-    method public static final androidx.lifecycle.Lifecycle.Event? upFrom(androidx.lifecycle.Lifecycle.State state);
-    method public static final androidx.lifecycle.Lifecycle.Event? upTo(androidx.lifecycle.Lifecycle.State state);
-    method public static androidx.lifecycle.Lifecycle.Event valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.lifecycle.Lifecycle.Event[] values();
-    property public final androidx.lifecycle.Lifecycle.State targetState;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_ANY;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_CREATE;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_DESTROY;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_PAUSE;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_RESUME;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_START;
-    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_STOP;
-    field public static final androidx.lifecycle.Lifecycle.Event.Companion Companion;
-  }
-
-  public static final class Lifecycle.Event.Companion {
-    method public androidx.lifecycle.Lifecycle.Event? downFrom(androidx.lifecycle.Lifecycle.State state);
-    method public androidx.lifecycle.Lifecycle.Event? downTo(androidx.lifecycle.Lifecycle.State state);
-    method public androidx.lifecycle.Lifecycle.Event? upFrom(androidx.lifecycle.Lifecycle.State state);
-    method public androidx.lifecycle.Lifecycle.Event? upTo(androidx.lifecycle.Lifecycle.State state);
-  }
-
-  public enum Lifecycle.State {
-    method public final boolean isAtLeast(androidx.lifecycle.Lifecycle.State state);
-    method public static androidx.lifecycle.Lifecycle.State valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
-    method public static androidx.lifecycle.Lifecycle.State[] values();
-    enum_constant public static final androidx.lifecycle.Lifecycle.State CREATED;
-    enum_constant public static final androidx.lifecycle.Lifecycle.State DESTROYED;
-    enum_constant public static final androidx.lifecycle.Lifecycle.State INITIALIZED;
-    enum_constant public static final androidx.lifecycle.Lifecycle.State RESUMED;
-    enum_constant public static final androidx.lifecycle.Lifecycle.State STARTED;
-  }
-
-  public abstract class LifecycleCoroutineScope implements kotlinx.coroutines.CoroutineScope {
-    method @Deprecated public final kotlinx.coroutines.Job launchWhenCreated(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
-    method @Deprecated public final kotlinx.coroutines.Job launchWhenResumed(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
-    method @Deprecated public final kotlinx.coroutines.Job launchWhenStarted(kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
-  }
-
-  public fun interface LifecycleEventObserver extends androidx.lifecycle.LifecycleObserver {
-    method public void onStateChanged(androidx.lifecycle.LifecycleOwner source, androidx.lifecycle.Lifecycle.Event event);
-  }
-
-  public final class LifecycleKt {
-    method public static androidx.lifecycle.LifecycleCoroutineScope getCoroutineScope(androidx.lifecycle.Lifecycle);
-    method public static kotlinx.coroutines.flow.Flow<androidx.lifecycle.Lifecycle.Event> getEventFlow(androidx.lifecycle.Lifecycle);
-  }
-
-  public interface LifecycleObserver {
-  }
-
-  public interface LifecycleOwner {
-    method public androidx.lifecycle.Lifecycle getLifecycle();
-    property public abstract androidx.lifecycle.Lifecycle lifecycle;
-  }
-
-  public final class LifecycleOwnerKt {
-    method public static androidx.lifecycle.LifecycleCoroutineScope getLifecycleScope(androidx.lifecycle.LifecycleOwner);
-  }
-
-  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) public @interface OnLifecycleEvent {
-    method @Deprecated public abstract androidx.lifecycle.Lifecycle.Event! value();
-  }
-
-  public final class PausingDispatcherKt {
-    method @Deprecated public static suspend <T> Object? whenCreated(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenCreated(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenResumed(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenResumed(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenStarted(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenStarted(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-    method @Deprecated public static suspend <T> Object? whenStateAtLeast(androidx.lifecycle.Lifecycle, androidx.lifecycle.Lifecycle.State minState, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super T>,?> block, kotlin.coroutines.Continuation<? super T>);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-extensions/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-extensions/api/public_plus_experimental_current.txt
deleted file mode 100644
index b99201f..0000000
--- a/lifecycle/lifecycle-extensions/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  @Deprecated public class ViewModelProviders {
-    ctor @Deprecated public ViewModelProviders();
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.Fragment);
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.Fragment, androidx.lifecycle.ViewModelProvider.Factory?);
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.FragmentActivity);
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.FragmentActivity, androidx.lifecycle.ViewModelProvider.Factory?);
-  }
-
-  @Deprecated public static class ViewModelProviders.DefaultFactory extends androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory {
-    ctor @Deprecated public ViewModelProviders.DefaultFactory(android.app.Application);
-  }
-
-  @Deprecated public class ViewModelStores {
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelStore of(androidx.fragment.app.Fragment);
-    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelStore of(androidx.fragment.app.FragmentActivity);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-livedata-core-ktx/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-livedata-core-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index daac648..0000000
--- a/lifecycle/lifecycle-livedata-core-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class LiveDataKt {
-    method @Deprecated @MainThread public static inline <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt
deleted file mode 100644
index 4f36e61..0000000
--- a/lifecycle/lifecycle-livedata-core/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public abstract class LiveData<T> {
-    ctor public LiveData();
-    ctor public LiveData(T!);
-    method public T? getValue();
-    method public boolean hasActiveObservers();
-    method public boolean hasObservers();
-    method public boolean isInitialized();
-    method @MainThread public void observe(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Observer<? super T>);
-    method @MainThread public void observeForever(androidx.lifecycle.Observer<? super T>);
-    method protected void onActive();
-    method protected void onInactive();
-    method protected void postValue(T!);
-    method @MainThread public void removeObserver(androidx.lifecycle.Observer<? super T>);
-    method @MainThread public void removeObservers(androidx.lifecycle.LifecycleOwner);
-    method @MainThread protected void setValue(T!);
-  }
-
-  public class MutableLiveData<T> extends androidx.lifecycle.LiveData<T> {
-    ctor public MutableLiveData();
-    ctor public MutableLiveData(T!);
-    method public void postValue(T!);
-    method public void setValue(T!);
-  }
-
-  public fun interface Observer<T> {
-    method public void onChanged(T value);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-livedata-ktx/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-livedata-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index d871976..0000000
--- a/lifecycle/lifecycle-livedata-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class CoroutineLiveDataKt {
-    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static <T> androidx.lifecycle.LiveData<T> liveData(optional kotlin.coroutines.CoroutineContext context, java.time.Duration timeout, kotlin.jvm.functions.Function2<? super androidx.lifecycle.LiveDataScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
-    method public static <T> androidx.lifecycle.LiveData<T> liveData(optional kotlin.coroutines.CoroutineContext context, optional long timeoutInMs, kotlin.jvm.functions.Function2<? super androidx.lifecycle.LiveDataScope<T>,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block);
-  }
-
-  public final class FlowLiveDataConversions {
-    method public static <T> kotlinx.coroutines.flow.Flow<T> asFlow(androidx.lifecycle.LiveData<T>);
-    method public static <T> androidx.lifecycle.LiveData<T> asLiveData(kotlinx.coroutines.flow.Flow<? extends T>);
-    method public static <T> androidx.lifecycle.LiveData<T> asLiveData(kotlinx.coroutines.flow.Flow<? extends T>, optional kotlin.coroutines.CoroutineContext context);
-    method @RequiresApi(android.os.Build.VERSION_CODES.O) public static <T> androidx.lifecycle.LiveData<T> asLiveData(kotlinx.coroutines.flow.Flow<? extends T>, optional kotlin.coroutines.CoroutineContext context, java.time.Duration timeout);
-    method public static <T> androidx.lifecycle.LiveData<T> asLiveData(kotlinx.coroutines.flow.Flow<? extends T>, optional kotlin.coroutines.CoroutineContext context, optional long timeoutInMs);
-  }
-
-  public interface LiveDataScope<T> {
-    method public suspend Object? emit(T value, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public suspend Object? emitSource(androidx.lifecycle.LiveData<T> source, kotlin.coroutines.Continuation<? super kotlinx.coroutines.DisposableHandle>);
-    method public T? getLatestValue();
-    property public abstract T? latestValue;
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-livedata/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-livedata/api/public_plus_experimental_current.txt
deleted file mode 100644
index da5dac9..0000000
--- a/lifecycle/lifecycle-livedata/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public class MediatorLiveData<T> extends androidx.lifecycle.MutableLiveData<T> {
-    ctor public MediatorLiveData();
-    ctor public MediatorLiveData(T!);
-    method @MainThread public <S> void addSource(androidx.lifecycle.LiveData<S!>, androidx.lifecycle.Observer<? super S>);
-    method @MainThread public <S> void removeSource(androidx.lifecycle.LiveData<S!>);
-  }
-
-  public final class Transformations {
-    method @CheckResult @MainThread public static <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
-    method @Deprecated @CheckResult @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, androidx.arch.core.util.Function<X,Y> mapFunction);
-    method @CheckResult @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<X,Y> transform);
-    method @Deprecated @CheckResult @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, androidx.arch.core.util.Function<X,androidx.lifecycle.LiveData<Y>> switchMapFunction);
-    method @CheckResult @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<X,androidx.lifecycle.LiveData<Y>> transform);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt
deleted file mode 100644
index 891c9c6..0000000
--- a/lifecycle/lifecycle-process/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class ProcessLifecycleInitializer implements androidx.startup.Initializer<androidx.lifecycle.LifecycleOwner> {
-    ctor public ProcessLifecycleInitializer();
-    method public androidx.lifecycle.LifecycleOwner create(android.content.Context context);
-    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>> dependencies();
-  }
-
-  public final class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
-    method public static androidx.lifecycle.LifecycleOwner get();
-    method public androidx.lifecycle.Lifecycle getLifecycle();
-    property public androidx.lifecycle.Lifecycle lifecycle;
-    field public static final androidx.lifecycle.ProcessLifecycleOwner.Companion Companion;
-  }
-
-  public static final class ProcessLifecycleOwner.Companion {
-    method public androidx.lifecycle.LifecycleOwner get();
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-reactivestreams-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/lifecycle/lifecycle-reactivestreams-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/lifecycle/lifecycle-reactivestreams/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-reactivestreams/api/public_plus_experimental_current.txt
deleted file mode 100644
index 138dd3e..0000000
--- a/lifecycle/lifecycle-reactivestreams/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class LiveDataReactiveStreams {
-    method public static <T> androidx.lifecycle.LiveData<T> fromPublisher(org.reactivestreams.Publisher<T>);
-    method public static <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LifecycleOwner lifecycle, androidx.lifecycle.LiveData<T> liveData);
-    method public static <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-runtime-compose/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-runtime-compose/api/public_plus_experimental_current.txt
deleted file mode 100644
index e61a916..0000000
--- a/lifecycle/lifecycle-runtime-compose/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle.compose {
-
-  public final class FlowExtKt {
-    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsStateWithLifecycle(kotlinx.coroutines.flow.Flow<? extends T>, T initialValue, androidx.lifecycle.Lifecycle lifecycle, optional androidx.lifecycle.Lifecycle.State minActiveState, optional kotlin.coroutines.CoroutineContext context);
-    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsStateWithLifecycle(kotlinx.coroutines.flow.Flow<? extends T>, T initialValue, optional androidx.lifecycle.LifecycleOwner lifecycleOwner, optional androidx.lifecycle.Lifecycle.State minActiveState, optional kotlin.coroutines.CoroutineContext context);
-    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsStateWithLifecycle(kotlinx.coroutines.flow.StateFlow<? extends T>, androidx.lifecycle.Lifecycle lifecycle, optional androidx.lifecycle.Lifecycle.State minActiveState, optional kotlin.coroutines.CoroutineContext context);
-    method @androidx.compose.runtime.Composable public static <T> androidx.compose.runtime.State<T> collectAsStateWithLifecycle(kotlinx.coroutines.flow.StateFlow<? extends T>, optional androidx.lifecycle.LifecycleOwner lifecycleOwner, optional androidx.lifecycle.Lifecycle.State minActiveState, optional kotlin.coroutines.CoroutineContext context);
-  }
-
-  public final class LifecycleEffectKt {
-    method @androidx.compose.runtime.Composable public static void LifecycleEventEffect(androidx.lifecycle.Lifecycle.Event event, optional androidx.lifecycle.LifecycleOwner lifecycleOwner, kotlin.jvm.functions.Function0<kotlin.Unit> onEvent);
-    method @androidx.compose.runtime.Composable public static void LifecycleResumeEffect(optional androidx.lifecycle.LifecycleOwner lifecycleOwner, kotlin.jvm.functions.Function1<? super androidx.lifecycle.compose.LifecycleResumePauseEffectScope,? extends androidx.lifecycle.compose.LifecyclePauseEffectResult> effects);
-    method @androidx.compose.runtime.Composable public static void LifecycleStartEffect(optional androidx.lifecycle.LifecycleOwner lifecycleOwner, kotlin.jvm.functions.Function1<? super androidx.lifecycle.compose.LifecycleStartStopEffectScope,? extends androidx.lifecycle.compose.LifecycleStopEffectResult> effects);
-  }
-
-  public final class LifecycleExtKt {
-    method @androidx.compose.runtime.Composable public static androidx.compose.runtime.State<androidx.lifecycle.Lifecycle.State> currentStateAsState(androidx.lifecycle.Lifecycle);
-  }
-
-  public interface LifecyclePauseEffectResult {
-    method public void runPauseEffect();
-  }
-
-  public final class LifecycleResumePauseEffectScope {
-    ctor public LifecycleResumePauseEffectScope();
-    method public inline androidx.lifecycle.compose.LifecyclePauseEffectResult onPause(kotlin.jvm.functions.Function0<kotlin.Unit> onPauseEffect);
-  }
-
-  public final class LifecycleStartStopEffectScope {
-    ctor public LifecycleStartStopEffectScope();
-    method public inline androidx.lifecycle.compose.LifecycleStopEffectResult onStop(kotlin.jvm.functions.Function0<kotlin.Unit> onStopEffect);
-  }
-
-  public interface LifecycleStopEffectResult {
-    method public void runStopEffect();
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-runtime-ktx/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-runtime-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 2ee0d85..0000000
--- a/lifecycle/lifecycle-runtime-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class FlowExtKt {
-    method public static <T> kotlinx.coroutines.flow.Flow<T> flowWithLifecycle(kotlinx.coroutines.flow.Flow<? extends T>, androidx.lifecycle.Lifecycle lifecycle, optional androidx.lifecycle.Lifecycle.State minActiveState);
-  }
-
-  public final class LifecycleDestroyedException extends java.util.concurrent.CancellationException {
-    ctor public LifecycleDestroyedException();
-  }
-
-  public final class RepeatOnLifecycleKt {
-    method public static suspend Object? repeatOnLifecycle(androidx.lifecycle.Lifecycle, androidx.lifecycle.Lifecycle.State state, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method public static suspend Object? repeatOnLifecycle(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.State state, kotlin.jvm.functions.Function2<? super kotlinx.coroutines.CoroutineScope,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,?> block, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-  }
-
-  public final class ViewKt {
-    method @Deprecated public static androidx.lifecycle.LifecycleOwner? findViewTreeLifecycleOwner(android.view.View);
-  }
-
-  public final class WithLifecycleStateKt {
-    method public static suspend inline <R> Object? withCreated(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withCreated(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withResumed(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withResumed(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withStarted(androidx.lifecycle.Lifecycle, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withStarted(androidx.lifecycle.LifecycleOwner, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withStateAtLeast(androidx.lifecycle.Lifecycle, androidx.lifecycle.Lifecycle.State state, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-    method public static suspend inline <R> Object? withStateAtLeast(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.State state, kotlin.jvm.functions.Function0<? extends R> block, kotlin.coroutines.Continuation<? super R>);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-runtime-testing/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-runtime-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index c37e888..0000000
--- a/lifecycle/lifecycle-runtime-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle.testing {
-
-  public final class TestLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
-    ctor public TestLifecycleOwner();
-    ctor public TestLifecycleOwner(optional androidx.lifecycle.Lifecycle.State initialState);
-    ctor public TestLifecycleOwner(optional androidx.lifecycle.Lifecycle.State initialState, optional kotlinx.coroutines.CoroutineDispatcher coroutineDispatcher);
-    method public androidx.lifecycle.Lifecycle.State getCurrentState();
-    method public androidx.lifecycle.LifecycleRegistry getLifecycle();
-    method public int getObserverCount();
-    method public void handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event event);
-    method public void setCurrentState(androidx.lifecycle.Lifecycle.State);
-    property public final androidx.lifecycle.Lifecycle.State currentState;
-    property public androidx.lifecycle.LifecycleRegistry lifecycle;
-    property public final int observerCount;
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-runtime/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-runtime/api/public_plus_experimental_current.txt
deleted file mode 100644
index b3a4ef0..0000000
--- a/lifecycle/lifecycle-runtime/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public class LifecycleRegistry extends androidx.lifecycle.Lifecycle {
-    ctor public LifecycleRegistry(androidx.lifecycle.LifecycleOwner provider);
-    method public void addObserver(androidx.lifecycle.LifecycleObserver observer);
-    method @VisibleForTesting public static final androidx.lifecycle.LifecycleRegistry createUnsafe(androidx.lifecycle.LifecycleOwner owner);
-    method public androidx.lifecycle.Lifecycle.State getCurrentState();
-    method public int getObserverCount();
-    method public void handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event event);
-    method @Deprecated @MainThread public void markState(androidx.lifecycle.Lifecycle.State state);
-    method public void removeObserver(androidx.lifecycle.LifecycleObserver observer);
-    method public void setCurrentState(androidx.lifecycle.Lifecycle.State);
-    property public androidx.lifecycle.Lifecycle.State currentState;
-    property public kotlinx.coroutines.flow.StateFlow<androidx.lifecycle.Lifecycle.State> currentStateFlow;
-    property public int observerCount;
-    field public static final androidx.lifecycle.LifecycleRegistry.Companion Companion;
-  }
-
-  public static final class LifecycleRegistry.Companion {
-    method @VisibleForTesting public androidx.lifecycle.LifecycleRegistry createUnsafe(androidx.lifecycle.LifecycleOwner owner);
-  }
-
-  @Deprecated public interface LifecycleRegistryOwner extends androidx.lifecycle.LifecycleOwner {
-    method @Deprecated public androidx.lifecycle.LifecycleRegistry getLifecycle();
-  }
-
-  public final class ViewTreeLifecycleOwner {
-    method public static androidx.lifecycle.LifecycleOwner? get(android.view.View);
-    method public static void set(android.view.View, androidx.lifecycle.LifecycleOwner? lifecycleOwner);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-service/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-service/api/public_plus_experimental_current.txt
deleted file mode 100644
index bebcd93..0000000
--- a/lifecycle/lifecycle-service/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public class LifecycleService extends android.app.Service implements androidx.lifecycle.LifecycleOwner {
-    ctor public LifecycleService();
-    method public androidx.lifecycle.Lifecycle getLifecycle();
-    method @CallSuper public android.os.IBinder? onBind(android.content.Intent intent);
-    property public androidx.lifecycle.Lifecycle lifecycle;
-  }
-
-  public class ServiceLifecycleDispatcher {
-    ctor public ServiceLifecycleDispatcher(androidx.lifecycle.LifecycleOwner provider);
-    method public androidx.lifecycle.Lifecycle getLifecycle();
-    method public void onServicePreSuperOnBind();
-    method public void onServicePreSuperOnCreate();
-    method public void onServicePreSuperOnDestroy();
-    method public void onServicePreSuperOnStart();
-    property public androidx.lifecycle.Lifecycle lifecycle;
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/current.txt b/lifecycle/lifecycle-viewmodel-compose/api/current.txt
index 2723628..482294a 100644
--- a/lifecycle/lifecycle-viewmodel-compose/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel-compose/api/current.txt
@@ -8,6 +8,16 @@
     field public static final androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner INSTANCE;
   }
 
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface SavedStateHandleSaveableApi {
+  }
+
+  public final class SavedStateHandleSaverKt {
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadOnlyProperty<java.lang.Object,T>> saveable(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> androidx.compose.runtime.MutableState<T> saveable(androidx.lifecycle.SavedStateHandle, String key, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> T saveable(androidx.lifecycle.SavedStateHandle, String key, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T, M extends androidx.compose.runtime.MutableState<T>> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadWriteProperty<java.lang.Object,T>> saveableMutableState(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends M> init);
+  }
+
   public final class ViewModelKt {
     method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
     method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt
deleted file mode 100644
index 482294a..0000000
--- a/lifecycle/lifecycle-viewmodel-compose/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle.viewmodel.compose {
-
-  public final class LocalViewModelStoreOwner {
-    method @androidx.compose.runtime.Composable public androidx.lifecycle.ViewModelStoreOwner? getCurrent();
-    method public infix androidx.compose.runtime.ProvidedValue<androidx.lifecycle.ViewModelStoreOwner> provides(androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner);
-    property @androidx.compose.runtime.Composable public final androidx.lifecycle.ViewModelStoreOwner? current;
-    field public static final androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner INSTANCE;
-  }
-
-  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface SavedStateHandleSaveableApi {
-  }
-
-  public final class SavedStateHandleSaverKt {
-    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadOnlyProperty<java.lang.Object,T>> saveable(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
-    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> androidx.compose.runtime.MutableState<T> saveable(androidx.lifecycle.SavedStateHandle, String key, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
-    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> T saveable(androidx.lifecycle.SavedStateHandle, String key, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
-    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T, M extends androidx.compose.runtime.MutableState<T>> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadWriteProperty<java.lang.Object,T>> saveableMutableState(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends M> init);
-  }
-
-  public final class ViewModelKt {
-    method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
-    method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
-    method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
-    method @Deprecated @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
-    method @androidx.compose.runtime.Composable public static <VM extends androidx.lifecycle.ViewModel> VM viewModel(Class<VM> modelClass, optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
index 2723628..482294a 100644
--- a/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel-compose/api/restricted_current.txt
@@ -8,6 +8,16 @@
     field public static final androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner INSTANCE;
   }
 
+  @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level.WARNING) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.FUNCTION) public @interface SavedStateHandleSaveableApi {
+  }
+
+  public final class SavedStateHandleSaverKt {
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadOnlyProperty<java.lang.Object,T>> saveable(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> androidx.compose.runtime.MutableState<T> saveable(androidx.lifecycle.SavedStateHandle, String key, androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends androidx.compose.runtime.MutableState<T>> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T> T saveable(androidx.lifecycle.SavedStateHandle, String key, optional androidx.compose.runtime.saveable.Saver<T,?> saver, kotlin.jvm.functions.Function0<? extends T> init);
+    method @androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi public static <T, M extends androidx.compose.runtime.MutableState<T>> kotlin.properties.PropertyDelegateProvider<java.lang.Object,kotlin.properties.ReadWriteProperty<java.lang.Object,T>> saveableMutableState(androidx.lifecycle.SavedStateHandle, optional androidx.compose.runtime.saveable.Saver<T,?> stateSaver, kotlin.jvm.functions.Function0<? extends M> init);
+  }
+
   public final class ViewModelKt {
     method @Deprecated @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory);
     method @androidx.compose.runtime.Composable public static inline <reified VM extends androidx.lifecycle.ViewModel> VM viewModel(optional androidx.lifecycle.ViewModelStoreOwner viewModelStoreOwner, optional String? key, optional androidx.lifecycle.ViewModelProvider.Factory? factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
diff --git a/lifecycle/lifecycle-viewmodel-ktx/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-viewmodel-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index 1d1d247..0000000
--- a/lifecycle/lifecycle-viewmodel-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public final class ViewModelKt {
-    method public static kotlinx.coroutines.CoroutineScope getViewModelScope(androidx.lifecycle.ViewModel);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/public_plus_experimental_current.txt
deleted file mode 100644
index 826cc1d..0000000
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public abstract class AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public AbstractSavedStateViewModelFactory();
-    ctor public AbstractSavedStateViewModelFactory(androidx.savedstate.SavedStateRegistryOwner owner, android.os.Bundle? defaultArgs);
-    method protected abstract <T extends androidx.lifecycle.ViewModel> T create(String key, Class<T> modelClass, androidx.lifecycle.SavedStateHandle handle);
-  }
-
-  public final class SavedStateHandle {
-    ctor public SavedStateHandle();
-    ctor public SavedStateHandle(java.util.Map<java.lang.String,?> initialState);
-    method @MainThread public void clearSavedStateProvider(String key);
-    method @MainThread public operator boolean contains(String key);
-    method @MainThread public operator <T> T? get(String key);
-    method @MainThread public <T> androidx.lifecycle.MutableLiveData<T> getLiveData(String key);
-    method @MainThread public <T> androidx.lifecycle.MutableLiveData<T> getLiveData(String key, T initialValue);
-    method @MainThread public <T> kotlinx.coroutines.flow.StateFlow<T> getStateFlow(String key, T initialValue);
-    method @MainThread public java.util.Set<java.lang.String> keys();
-    method @MainThread public <T> T? remove(String key);
-    method @MainThread public operator <T> void set(String key, T? value);
-    method @MainThread public void setSavedStateProvider(String key, androidx.savedstate.SavedStateRegistry.SavedStateProvider provider);
-    field public static final androidx.lifecycle.SavedStateHandle.Companion Companion;
-  }
-
-  public static final class SavedStateHandle.Companion {
-  }
-
-  public final class SavedStateHandleSupport {
-    method @MainThread public static androidx.lifecycle.SavedStateHandle createSavedStateHandle(androidx.lifecycle.viewmodel.CreationExtras);
-    method @MainThread public static <T extends androidx.savedstate.SavedStateRegistryOwner & androidx.lifecycle.ViewModelStoreOwner> void enableSavedStateHandles(T);
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Key<android.os.Bundle> DEFAULT_ARGS_KEY;
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.savedstate.SavedStateRegistryOwner> SAVED_STATE_REGISTRY_OWNER_KEY;
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.lifecycle.ViewModelStoreOwner> VIEW_MODEL_STORE_OWNER_KEY;
-  }
-
-  public final class SavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public SavedStateViewModelFactory();
-    ctor public SavedStateViewModelFactory(android.app.Application? application, androidx.savedstate.SavedStateRegistryOwner owner);
-    ctor public SavedStateViewModelFactory(android.app.Application? application, androidx.savedstate.SavedStateRegistryOwner owner, android.os.Bundle? defaultArgs);
-    method public <T extends androidx.lifecycle.ViewModel> T create(String key, Class<T> modelClass);
-  }
-
-}
-
diff --git a/lifecycle/lifecycle-viewmodel/api/public_plus_experimental_current.txt b/lifecycle/lifecycle-viewmodel/api/public_plus_experimental_current.txt
deleted file mode 100644
index b271d9c..0000000
--- a/lifecycle/lifecycle-viewmodel/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-// Signature format: 4.0
-package androidx.lifecycle {
-
-  public class AndroidViewModel extends androidx.lifecycle.ViewModel {
-    ctor public AndroidViewModel(android.app.Application application);
-    method public <T extends android.app.Application> T getApplication();
-  }
-
-  public interface HasDefaultViewModelProviderFactory {
-    method public default androidx.lifecycle.viewmodel.CreationExtras getDefaultViewModelCreationExtras();
-    method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
-    property public default androidx.lifecycle.viewmodel.CreationExtras defaultViewModelCreationExtras;
-    property public abstract androidx.lifecycle.ViewModelProvider.Factory defaultViewModelProviderFactory;
-  }
-
-  public abstract class ViewModel {
-    ctor public ViewModel();
-    ctor public ViewModel(java.io.Closeable!...);
-    method public void addCloseable(java.io.Closeable);
-    method protected void onCleared();
-  }
-
-  public final class ViewModelLazy<VM extends androidx.lifecycle.ViewModel> implements kotlin.Lazy<VM> {
-    ctor public ViewModelLazy(kotlin.reflect.KClass<VM> viewModelClass, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStore> storeProducer, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory> factoryProducer);
-    ctor public ViewModelLazy(kotlin.reflect.KClass<VM> viewModelClass, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStore> storeProducer, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory> factoryProducer, optional kotlin.jvm.functions.Function0<? extends androidx.lifecycle.viewmodel.CreationExtras> extrasProducer);
-    method public VM getValue();
-    method public boolean isInitialized();
-    property public VM value;
-  }
-
-  public class ViewModelProvider {
-    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory);
-    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStore store, androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras defaultCreationExtras);
-    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner);
-    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner owner, androidx.lifecycle.ViewModelProvider.Factory factory);
-    method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(Class<T> modelClass);
-    method @MainThread public operator <T extends androidx.lifecycle.ViewModel> T get(String key, Class<T> modelClass);
-  }
-
-  public static class ViewModelProvider.AndroidViewModelFactory extends androidx.lifecycle.ViewModelProvider.NewInstanceFactory {
-    ctor public ViewModelProvider.AndroidViewModelFactory();
-    ctor public ViewModelProvider.AndroidViewModelFactory(android.app.Application application);
-    method public static final androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory getInstance(android.app.Application application);
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Key<android.app.Application> APPLICATION_KEY;
-    field public static final androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion Companion;
-  }
-
-  public static final class ViewModelProvider.AndroidViewModelFactory.Companion {
-    method public androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory getInstance(android.app.Application application);
-  }
-
-  public static interface ViewModelProvider.Factory {
-    method public default <T extends androidx.lifecycle.ViewModel> T create(Class<T> modelClass);
-    method public default <T extends androidx.lifecycle.ViewModel> T create(Class<T> modelClass, androidx.lifecycle.viewmodel.CreationExtras extras);
-    method public default static androidx.lifecycle.ViewModelProvider.Factory from(androidx.lifecycle.viewmodel.ViewModelInitializer<?>... initializers);
-    field public static final androidx.lifecycle.ViewModelProvider.Factory.Companion Companion;
-  }
-
-  public static final class ViewModelProvider.Factory.Companion {
-    method public androidx.lifecycle.ViewModelProvider.Factory from(androidx.lifecycle.viewmodel.ViewModelInitializer<?>... initializers);
-  }
-
-  public static class ViewModelProvider.NewInstanceFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public ViewModelProvider.NewInstanceFactory();
-    field public static final androidx.lifecycle.ViewModelProvider.NewInstanceFactory.Companion Companion;
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Key<java.lang.String> VIEW_MODEL_KEY;
-  }
-
-  public static final class ViewModelProvider.NewInstanceFactory.Companion {
-  }
-
-  public final class ViewModelProviderGetKt {
-    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> VM get(androidx.lifecycle.ViewModelProvider);
-  }
-
-  public class ViewModelStore {
-    ctor public ViewModelStore();
-    method public final void clear();
-  }
-
-  public interface ViewModelStoreOwner {
-    method public androidx.lifecycle.ViewModelStore getViewModelStore();
-    property public abstract androidx.lifecycle.ViewModelStore viewModelStore;
-  }
-
-  public final class ViewTreeViewModelKt {
-    method @Deprecated public static androidx.lifecycle.ViewModelStoreOwner? findViewTreeViewModelStoreOwner(android.view.View view);
-  }
-
-  public final class ViewTreeViewModelStoreOwner {
-    method public static androidx.lifecycle.ViewModelStoreOwner? get(android.view.View);
-    method public static void set(android.view.View, androidx.lifecycle.ViewModelStoreOwner? viewModelStoreOwner);
-  }
-
-}
-
-package androidx.lifecycle.viewmodel {
-
-  public abstract class CreationExtras {
-    method public abstract operator <T> T? get(androidx.lifecycle.viewmodel.CreationExtras.Key<T> key);
-  }
-
-  public static final class CreationExtras.Empty extends androidx.lifecycle.viewmodel.CreationExtras {
-    method public <T> T? get(androidx.lifecycle.viewmodel.CreationExtras.Key<T> key);
-    field public static final androidx.lifecycle.viewmodel.CreationExtras.Empty INSTANCE;
-  }
-
-  public static interface CreationExtras.Key<T> {
-  }
-
-  @androidx.lifecycle.viewmodel.ViewModelFactoryDsl public final class InitializerViewModelFactoryBuilder {
-    ctor public InitializerViewModelFactoryBuilder();
-    method public <T extends androidx.lifecycle.ViewModel> void addInitializer(kotlin.reflect.KClass<T> clazz, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends T> initializer);
-    method public androidx.lifecycle.ViewModelProvider.Factory build();
-  }
-
-  public final class InitializerViewModelFactoryKt {
-    method public static inline <reified VM extends androidx.lifecycle.ViewModel> void initializer(androidx.lifecycle.viewmodel.InitializerViewModelFactoryBuilder, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends VM> initializer);
-    method public static inline androidx.lifecycle.ViewModelProvider.Factory viewModelFactory(kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.InitializerViewModelFactoryBuilder,kotlin.Unit> builder);
-  }
-
-  public final class MutableCreationExtras extends androidx.lifecycle.viewmodel.CreationExtras {
-    ctor public MutableCreationExtras(optional androidx.lifecycle.viewmodel.CreationExtras initialExtras);
-    method public <T> T? get(androidx.lifecycle.viewmodel.CreationExtras.Key<T> key);
-    method public operator <T> void set(androidx.lifecycle.viewmodel.CreationExtras.Key<T> key, T t);
-  }
-
-  @kotlin.DslMarker public @interface ViewModelFactoryDsl {
-  }
-
-  public final class ViewModelInitializer<T extends androidx.lifecycle.ViewModel> {
-    ctor public ViewModelInitializer(Class<T> clazz, kotlin.jvm.functions.Function1<? super androidx.lifecycle.viewmodel.CreationExtras,? extends T> initializer);
-  }
-
-}
-
diff --git a/loader/loader-ktx/api/public_plus_experimental_current.txt b/loader/loader-ktx/api/public_plus_experimental_current.txt
deleted file mode 100644
index e89c982..0000000
--- a/loader/loader-ktx/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// Signature format: 4.0
-package androidx.loader.app {
-
-  public final class LoaderManagerKt {
-    method @MainThread public static inline <D> void initLoader(androidx.loader.app.LoaderManager, int id, androidx.loader.content.Loader<D> loader, optional kotlin.jvm.functions.Function0<kotlin.Unit> onLoaderReset, kotlin.jvm.functions.Function1<? super D,kotlin.Unit> onLoadFinished);
-    method @MainThread public static inline <D> void restartLoader(androidx.loader.app.LoaderManager, int id, androidx.loader.content.Loader<D> loader, optional kotlin.jvm.functions.Function0<kotlin.Unit> onLoaderReset, kotlin.jvm.functions.Function1<? super D,kotlin.Unit> onLoadFinished);
-  }
-
-}
-
diff --git a/loader/loader/api/public_plus_experimental_current.txt b/loader/loader/api/public_plus_experimental_current.txt
deleted file mode 100644
index 9b59aa7..0000000
--- a/loader/loader/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-// Signature format: 4.0
-package androidx.loader.app {
-
-  public abstract class LoaderManager {
-    ctor public LoaderManager();
-    method @MainThread public abstract void destroyLoader(int);
-    method @Deprecated public abstract void dump(String, java.io.FileDescriptor?, java.io.PrintWriter, String![]?);
-    method @Deprecated public static void enableDebugLogging(boolean);
-    method public static <T extends androidx.lifecycle.LifecycleOwner & androidx.lifecycle.ViewModelStoreOwner> androidx.loader.app.LoaderManager getInstance(T);
-    method public abstract <D> androidx.loader.content.Loader<D!>? getLoader(int);
-    method public boolean hasRunningLoaders();
-    method @MainThread public abstract <D> androidx.loader.content.Loader<D!> initLoader(int, android.os.Bundle?, androidx.loader.app.LoaderManager.LoaderCallbacks<D!>);
-    method public abstract void markForRedelivery();
-    method @MainThread public abstract <D> androidx.loader.content.Loader<D!> restartLoader(int, android.os.Bundle?, androidx.loader.app.LoaderManager.LoaderCallbacks<D!>);
-  }
-
-  public static interface LoaderManager.LoaderCallbacks<D> {
-    method @MainThread public androidx.loader.content.Loader<D!> onCreateLoader(int, android.os.Bundle?);
-    method @MainThread public void onLoadFinished(androidx.loader.content.Loader<D!>, D!);
-    method @MainThread public void onLoaderReset(androidx.loader.content.Loader<D!>);
-  }
-
-}
-
-package androidx.loader.content {
-
-  public abstract class AsyncTaskLoader<D> extends androidx.loader.content.Loader<D> {
-    ctor public AsyncTaskLoader(android.content.Context);
-    method public void cancelLoadInBackground();
-    method protected java.util.concurrent.Executor getExecutor();
-    method public boolean isLoadInBackgroundCanceled();
-    method public abstract D? loadInBackground();
-    method public void onCanceled(D?);
-    method protected D? onLoadInBackground();
-    method public void setUpdateThrottle(long);
-  }
-
-  public class CursorLoader extends androidx.loader.content.AsyncTaskLoader<android.database.Cursor> {
-    ctor public CursorLoader(android.content.Context);
-    ctor public CursorLoader(android.content.Context, android.net.Uri, String![]?, String?, String![]?, String?);
-    method public void deliverResult(android.database.Cursor?);
-    method public String![]? getProjection();
-    method public String? getSelection();
-    method public String![]? getSelectionArgs();
-    method public String? getSortOrder();
-    method public android.net.Uri getUri();
-    method public android.database.Cursor? loadInBackground();
-    method public void onCanceled(android.database.Cursor?);
-    method public void setProjection(String![]?);
-    method public void setSelection(String?);
-    method public void setSelectionArgs(String![]?);
-    method public void setSortOrder(String?);
-    method public void setUri(android.net.Uri);
-  }
-
-  public class Loader<D> {
-    ctor public Loader(android.content.Context);
-    method @MainThread public void abandon();
-    method @MainThread public boolean cancelLoad();
-    method public void commitContentChanged();
-    method public String dataToString(D?);
-    method @MainThread public void deliverCancellation();
-    method @MainThread public void deliverResult(D?);
-    method @Deprecated public void dump(String, java.io.FileDescriptor?, java.io.PrintWriter, String![]?);
-    method @MainThread public void forceLoad();
-    method public android.content.Context getContext();
-    method public int getId();
-    method public boolean isAbandoned();
-    method public boolean isReset();
-    method public boolean isStarted();
-    method @MainThread protected void onAbandon();
-    method @MainThread protected boolean onCancelLoad();
-    method @MainThread public void onContentChanged();
-    method @MainThread protected void onForceLoad();
-    method @MainThread protected void onReset();
-    method @MainThread protected void onStartLoading();
-    method @MainThread protected void onStopLoading();
-    method @MainThread public void registerListener(int, androidx.loader.content.Loader.OnLoadCompleteListener<D!>);
-    method @MainThread public void registerOnLoadCanceledListener(androidx.loader.content.Loader.OnLoadCanceledListener<D!>);
-    method @MainThread public void reset();
-    method public void rollbackContentChanged();
-    method @MainThread public final void startLoading();
-    method @MainThread public void stopLoading();
-    method public boolean takeContentChanged();
-    method @MainThread public void unregisterListener(androidx.loader.content.Loader.OnLoadCompleteListener<D!>);
-    method @MainThread public void unregisterOnLoadCanceledListener(androidx.loader.content.Loader.OnLoadCanceledListener<D!>);
-  }
-
-  public final class Loader.ForceLoadContentObserver extends android.database.ContentObserver {
-    ctor public Loader.ForceLoadContentObserver();
-  }
-
-  public static interface Loader.OnLoadCanceledListener<D> {
-    method public void onLoadCanceled(androidx.loader.content.Loader<D!>);
-  }
-
-  public static interface Loader.OnLoadCompleteListener<D> {
-    method public void onLoadComplete(androidx.loader.content.Loader<D!>, D?);
-  }
-
-}
-
diff --git a/media2/media2-common/api/public_plus_experimental_current.txt b/media2/media2-common/api/public_plus_experimental_current.txt
deleted file mode 100644
index 7992d7b..0000000
--- a/media2/media2-common/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,273 +0,0 @@
-// Signature format: 4.0
-package androidx.media2.common {
-
-  public class CallbackMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
-    method public androidx.media2.common.DataSourceCallback getDataSourceCallback();
-  }
-
-  public static final class CallbackMediaItem.Builder extends androidx.media2.common.MediaItem.Builder {
-    ctor public CallbackMediaItem.Builder(androidx.media2.common.DataSourceCallback);
-    method public androidx.media2.common.CallbackMediaItem build();
-    method public androidx.media2.common.CallbackMediaItem.Builder setEndPosition(long);
-    method public androidx.media2.common.CallbackMediaItem.Builder setMetadata(androidx.media2.common.MediaMetadata?);
-    method public androidx.media2.common.CallbackMediaItem.Builder setStartPosition(long);
-  }
-
-  public abstract class DataSourceCallback implements java.io.Closeable {
-    ctor public DataSourceCallback();
-    method public abstract long getSize() throws java.io.IOException;
-    method public abstract int readAt(long, byte[], int, int) throws java.io.IOException;
-  }
-
-  public class FileMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
-    method public long getFileDescriptorLength();
-    method public long getFileDescriptorOffset();
-    method public android.os.ParcelFileDescriptor getParcelFileDescriptor();
-    field public static final long FD_LENGTH_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL
-  }
-
-  public static final class FileMediaItem.Builder extends androidx.media2.common.MediaItem.Builder {
-    ctor public FileMediaItem.Builder(android.os.ParcelFileDescriptor);
-    method public androidx.media2.common.FileMediaItem build();
-    method public androidx.media2.common.FileMediaItem.Builder setEndPosition(long);
-    method public androidx.media2.common.FileMediaItem.Builder setFileDescriptorLength(long);
-    method public androidx.media2.common.FileMediaItem.Builder setFileDescriptorOffset(long);
-    method public androidx.media2.common.FileMediaItem.Builder setMetadata(androidx.media2.common.MediaMetadata?);
-    method public androidx.media2.common.FileMediaItem.Builder setStartPosition(long);
-  }
-
-  public class MediaItem implements androidx.versionedparcelable.VersionedParcelable {
-    method public long getEndPosition();
-    method public androidx.media2.common.MediaMetadata? getMetadata();
-    method public long getStartPosition();
-    method public void setMetadata(androidx.media2.common.MediaMetadata?);
-    field public static final long POSITION_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL
-  }
-
-  public static class MediaItem.Builder {
-    ctor public MediaItem.Builder();
-    method public androidx.media2.common.MediaItem build();
-    method public androidx.media2.common.MediaItem.Builder setEndPosition(long);
-    method public androidx.media2.common.MediaItem.Builder setMetadata(androidx.media2.common.MediaMetadata?);
-    method public androidx.media2.common.MediaItem.Builder setStartPosition(long);
-  }
-
-  public final class MediaMetadata implements androidx.versionedparcelable.VersionedParcelable {
-    method public boolean containsKey(String);
-    method public android.graphics.Bitmap? getBitmap(String);
-    method public android.os.Bundle? getExtras();
-    method public float getFloat(String);
-    method public long getLong(String);
-    method public String? getMediaId();
-    method public androidx.media2.common.Rating? getRating(String);
-    method public String? getString(String);
-    method public CharSequence? getText(String);
-    method public java.util.Set<java.lang.String!> keySet();
-    method public int size();
-    field public static final long BROWSABLE_TYPE_ALBUMS = 2L; // 0x2L
-    field public static final long BROWSABLE_TYPE_ARTISTS = 3L; // 0x3L
-    field public static final long BROWSABLE_TYPE_GENRES = 4L; // 0x4L
-    field public static final long BROWSABLE_TYPE_MIXED = 0L; // 0x0L
-    field public static final long BROWSABLE_TYPE_NONE = -1L; // 0xffffffffffffffffL
-    field public static final long BROWSABLE_TYPE_PLAYLISTS = 5L; // 0x5L
-    field public static final long BROWSABLE_TYPE_TITLES = 1L; // 0x1L
-    field public static final long BROWSABLE_TYPE_YEARS = 6L; // 0x6L
-    field public static final String METADATA_KEY_ADVERTISEMENT = "androidx.media2.metadata.ADVERTISEMENT";
-    field public static final String METADATA_KEY_ALBUM = "android.media.metadata.ALBUM";
-    field public static final String METADATA_KEY_ALBUM_ART = "android.media.metadata.ALBUM_ART";
-    field public static final String METADATA_KEY_ALBUM_ARTIST = "android.media.metadata.ALBUM_ARTIST";
-    field public static final String METADATA_KEY_ALBUM_ART_URI = "android.media.metadata.ALBUM_ART_URI";
-    field public static final String METADATA_KEY_ART = "android.media.metadata.ART";
-    field public static final String METADATA_KEY_ARTIST = "android.media.metadata.ARTIST";
-    field public static final String METADATA_KEY_ART_URI = "android.media.metadata.ART_URI";
-    field public static final String METADATA_KEY_AUTHOR = "android.media.metadata.AUTHOR";
-    field public static final String METADATA_KEY_BROWSABLE = "androidx.media2.metadata.BROWSABLE";
-    field public static final String METADATA_KEY_COMPILATION = "android.media.metadata.COMPILATION";
-    field public static final String METADATA_KEY_COMPOSER = "android.media.metadata.COMPOSER";
-    field public static final String METADATA_KEY_DATE = "android.media.metadata.DATE";
-    field public static final String METADATA_KEY_DISC_NUMBER = "android.media.metadata.DISC_NUMBER";
-    field public static final String METADATA_KEY_DISPLAY_DESCRIPTION = "android.media.metadata.DISPLAY_DESCRIPTION";
-    field public static final String METADATA_KEY_DISPLAY_ICON = "android.media.metadata.DISPLAY_ICON";
-    field public static final String METADATA_KEY_DISPLAY_ICON_URI = "android.media.metadata.DISPLAY_ICON_URI";
-    field public static final String METADATA_KEY_DISPLAY_SUBTITLE = "android.media.metadata.DISPLAY_SUBTITLE";
-    field public static final String METADATA_KEY_DISPLAY_TITLE = "android.media.metadata.DISPLAY_TITLE";
-    field public static final String METADATA_KEY_DOWNLOAD_STATUS = "androidx.media2.metadata.DOWNLOAD_STATUS";
-    field public static final String METADATA_KEY_DURATION = "android.media.metadata.DURATION";
-    field public static final String METADATA_KEY_EXTRAS = "androidx.media2.metadata.EXTRAS";
-    field public static final String METADATA_KEY_GENRE = "android.media.metadata.GENRE";
-    field public static final String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";
-    field public static final String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";
-    field public static final String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS";
-    field public static final String METADATA_KEY_PLAYABLE = "androidx.media2.metadata.PLAYABLE";
-    field public static final String METADATA_KEY_RATING = "android.media.metadata.RATING";
-    field public static final String METADATA_KEY_TITLE = "android.media.metadata.TITLE";
-    field public static final String METADATA_KEY_TRACK_NUMBER = "android.media.metadata.TRACK_NUMBER";
-    field public static final String METADATA_KEY_USER_RATING = "android.media.metadata.USER_RATING";
-    field public static final String METADATA_KEY_WRITER = "android.media.metadata.WRITER";
-    field public static final String METADATA_KEY_YEAR = "android.media.metadata.YEAR";
-    field public static final long STATUS_DOWNLOADED = 2L; // 0x2L
-    field public static final long STATUS_DOWNLOADING = 1L; // 0x1L
-    field public static final long STATUS_NOT_DOWNLOADED = 0L; // 0x0L
-  }
-
-  public static final class MediaMetadata.Builder {
-    ctor public MediaMetadata.Builder();
-    ctor public MediaMetadata.Builder(androidx.media2.common.MediaMetadata);
-    method public androidx.media2.common.MediaMetadata build();
-    method public androidx.media2.common.MediaMetadata.Builder putBitmap(String, android.graphics.Bitmap?);
-    method public androidx.media2.common.MediaMetadata.Builder putFloat(String, float);
-    method public androidx.media2.common.MediaMetadata.Builder putLong(String, long);
-    method public androidx.media2.common.MediaMetadata.Builder putRating(String, androidx.media2.common.Rating?);
-    method public androidx.media2.common.MediaMetadata.Builder putString(String, String?);
-    method public androidx.media2.common.MediaMetadata.Builder putText(String, CharSequence?);
-    method public androidx.media2.common.MediaMetadata.Builder setExtras(android.os.Bundle?);
-  }
-
-  public interface Rating extends androidx.versionedparcelable.VersionedParcelable {
-    method public boolean isRated();
-  }
-
-  public abstract class SessionPlayer implements java.io.Closeable {
-    ctor public SessionPlayer();
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> addPlaylistItem(int, androidx.media2.common.MediaItem);
-    method @CallSuper public void close();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> deselectTrack(androidx.media2.common.SessionPlayer.TrackInfo);
-    method public abstract androidx.media.AudioAttributesCompat? getAudioAttributes();
-    method public abstract long getBufferedPosition();
-    method public abstract int getBufferingState();
-    method protected final java.util.List<androidx.core.util.Pair<androidx.media2.common.SessionPlayer.PlayerCallback!,java.util.concurrent.Executor!>!> getCallbacks();
-    method public abstract androidx.media2.common.MediaItem? getCurrentMediaItem();
-    method @IntRange(from=androidx.media2.common.SessionPlayer.INVALID_ITEM_INDEX) public abstract int getCurrentMediaItemIndex();
-    method public abstract long getCurrentPosition();
-    method public abstract long getDuration();
-    method @IntRange(from=androidx.media2.common.SessionPlayer.INVALID_ITEM_INDEX) public abstract int getNextMediaItemIndex();
-    method public abstract float getPlaybackSpeed();
-    method public abstract int getPlayerState();
-    method public abstract java.util.List<androidx.media2.common.MediaItem!>? getPlaylist();
-    method public abstract androidx.media2.common.MediaMetadata? getPlaylistMetadata();
-    method @IntRange(from=androidx.media2.common.SessionPlayer.INVALID_ITEM_INDEX) public abstract int getPreviousMediaItemIndex();
-    method public abstract int getRepeatMode();
-    method public androidx.media2.common.SessionPlayer.TrackInfo? getSelectedTrack(int);
-    method public abstract int getShuffleMode();
-    method public java.util.List<androidx.media2.common.SessionPlayer.TrackInfo!> getTracks();
-    method public androidx.media2.common.VideoSize getVideoSize();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> movePlaylistItem(@IntRange(from=0) int, @IntRange(from=0) int);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> pause();
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> play();
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> prepare();
-    method public final void registerPlayerCallback(java.util.concurrent.Executor, androidx.media2.common.SessionPlayer.PlayerCallback);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> removePlaylistItem(@IntRange(from=0) int);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> replacePlaylistItem(int, androidx.media2.common.MediaItem);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> seekTo(long);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> selectTrack(androidx.media2.common.SessionPlayer.TrackInfo);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setAudioAttributes(androidx.media.AudioAttributesCompat);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setMediaItem(androidx.media2.common.MediaItem);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlaybackSpeed(float);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlaylist(java.util.List<androidx.media2.common.MediaItem!>, androidx.media2.common.MediaMetadata?);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setRepeatMode(int);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setShuffleMode(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setSurface(android.view.Surface?);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToNextPlaylistItem();
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToPlaylistItem(@IntRange(from=0) int);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToPreviousPlaylistItem();
-    method public final void unregisterPlayerCallback(androidx.media2.common.SessionPlayer.PlayerCallback);
-    method public abstract com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> updatePlaylistMetadata(androidx.media2.common.MediaMetadata?);
-    field public static final int BUFFERING_STATE_BUFFERING_AND_PLAYABLE = 1; // 0x1
-    field public static final int BUFFERING_STATE_BUFFERING_AND_STARVED = 2; // 0x2
-    field public static final int BUFFERING_STATE_COMPLETE = 3; // 0x3
-    field public static final int BUFFERING_STATE_UNKNOWN = 0; // 0x0
-    field public static final int INVALID_ITEM_INDEX = -1; // 0xffffffff
-    field public static final int PLAYER_STATE_ERROR = 3; // 0x3
-    field public static final int PLAYER_STATE_IDLE = 0; // 0x0
-    field public static final int PLAYER_STATE_PAUSED = 1; // 0x1
-    field public static final int PLAYER_STATE_PLAYING = 2; // 0x2
-    field public static final int REPEAT_MODE_ALL = 2; // 0x2
-    field public static final int REPEAT_MODE_GROUP = 3; // 0x3
-    field public static final int REPEAT_MODE_NONE = 0; // 0x0
-    field public static final int REPEAT_MODE_ONE = 1; // 0x1
-    field public static final int SHUFFLE_MODE_ALL = 1; // 0x1
-    field public static final int SHUFFLE_MODE_GROUP = 2; // 0x2
-    field public static final int SHUFFLE_MODE_NONE = 0; // 0x0
-    field public static final long UNKNOWN_TIME = -9223372036854775808L; // 0x8000000000000000L
-  }
-
-  public abstract static class SessionPlayer.PlayerCallback {
-    ctor public SessionPlayer.PlayerCallback();
-    method public void onAudioAttributesChanged(androidx.media2.common.SessionPlayer, androidx.media.AudioAttributesCompat?);
-    method public void onBufferingStateChanged(androidx.media2.common.SessionPlayer, androidx.media2.common.MediaItem?, int);
-    method public void onCurrentMediaItemChanged(androidx.media2.common.SessionPlayer, androidx.media2.common.MediaItem?);
-    method public void onPlaybackCompleted(androidx.media2.common.SessionPlayer);
-    method public void onPlaybackSpeedChanged(androidx.media2.common.SessionPlayer, float);
-    method public void onPlayerStateChanged(androidx.media2.common.SessionPlayer, int);
-    method public void onPlaylistChanged(androidx.media2.common.SessionPlayer, java.util.List<androidx.media2.common.MediaItem!>?, androidx.media2.common.MediaMetadata?);
-    method public void onPlaylistMetadataChanged(androidx.media2.common.SessionPlayer, androidx.media2.common.MediaMetadata?);
-    method public void onRepeatModeChanged(androidx.media2.common.SessionPlayer, int);
-    method public void onSeekCompleted(androidx.media2.common.SessionPlayer, long);
-    method public void onShuffleModeChanged(androidx.media2.common.SessionPlayer, int);
-    method public void onSubtitleData(androidx.media2.common.SessionPlayer, androidx.media2.common.MediaItem, androidx.media2.common.SessionPlayer.TrackInfo, androidx.media2.common.SubtitleData);
-    method public void onTrackDeselected(androidx.media2.common.SessionPlayer, androidx.media2.common.SessionPlayer.TrackInfo);
-    method public void onTrackSelected(androidx.media2.common.SessionPlayer, androidx.media2.common.SessionPlayer.TrackInfo);
-    method public void onTracksChanged(androidx.media2.common.SessionPlayer, java.util.List<androidx.media2.common.SessionPlayer.TrackInfo!>);
-    method public void onVideoSizeChanged(androidx.media2.common.SessionPlayer, androidx.media2.common.VideoSize);
-  }
-
-  public static class SessionPlayer.PlayerResult {
-    ctor public SessionPlayer.PlayerResult(int, androidx.media2.common.MediaItem?);
-    method public long getCompletionTime();
-    method public androidx.media2.common.MediaItem? getMediaItem();
-    method public int getResultCode();
-    field public static final int RESULT_ERROR_BAD_VALUE = -3; // 0xfffffffd
-    field public static final int RESULT_ERROR_INVALID_STATE = -2; // 0xfffffffe
-    field public static final int RESULT_ERROR_IO = -5; // 0xfffffffb
-    field public static final int RESULT_ERROR_NOT_SUPPORTED = -6; // 0xfffffffa
-    field public static final int RESULT_ERROR_PERMISSION_DENIED = -4; // 0xfffffffc
-    field public static final int RESULT_ERROR_UNKNOWN = -1; // 0xffffffff
-    field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
-    field public static final int RESULT_SUCCESS = 0; // 0x0
-  }
-
-  public static class SessionPlayer.TrackInfo implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SessionPlayer.TrackInfo(int, int, android.media.MediaFormat?);
-    ctor public SessionPlayer.TrackInfo(int, int, android.media.MediaFormat?, boolean);
-    method public android.media.MediaFormat? getFormat();
-    method public int getId();
-    method public java.util.Locale getLanguage();
-    method public int getTrackType();
-    method public boolean isSelectable();
-    field public static final int MEDIA_TRACK_TYPE_AUDIO = 2; // 0x2
-    field public static final int MEDIA_TRACK_TYPE_METADATA = 5; // 0x5
-    field public static final int MEDIA_TRACK_TYPE_SUBTITLE = 4; // 0x4
-    field public static final int MEDIA_TRACK_TYPE_UNKNOWN = 0; // 0x0
-    field public static final int MEDIA_TRACK_TYPE_VIDEO = 1; // 0x1
-  }
-
-  public final class SubtitleData implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SubtitleData(long, long, byte[]);
-    method public byte[] getData();
-    method public long getDurationUs();
-    method public long getStartTimeUs();
-  }
-
-  public class UriMediaItem extends androidx.media2.common.MediaItem implements androidx.versionedparcelable.VersionedParcelable {
-    method public android.net.Uri getUri();
-    method public java.util.List<java.net.HttpCookie!>? getUriCookies();
-    method public java.util.Map<java.lang.String!,java.lang.String!>? getUriHeaders();
-  }
-
-  public static final class UriMediaItem.Builder extends androidx.media2.common.MediaItem.Builder {
-    ctor public UriMediaItem.Builder(android.net.Uri);
-    ctor public UriMediaItem.Builder(android.net.Uri, java.util.Map<java.lang.String!,java.lang.String!>?, java.util.List<java.net.HttpCookie!>?);
-    method public androidx.media2.common.UriMediaItem build();
-    method public androidx.media2.common.UriMediaItem.Builder setEndPosition(long);
-    method public androidx.media2.common.UriMediaItem.Builder setMetadata(androidx.media2.common.MediaMetadata?);
-    method public androidx.media2.common.UriMediaItem.Builder setStartPosition(long);
-  }
-
-  public class VideoSize implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public VideoSize(@IntRange(from=0) int, @IntRange(from=0) int);
-    method @IntRange(from=0) public int getHeight();
-    method @IntRange(from=0) public int getWidth();
-  }
-
-}
-
diff --git a/media2/media2-exoplayer/api/public_plus_experimental_current.txt b/media2/media2-exoplayer/api/public_plus_experimental_current.txt
deleted file mode 100644
index e6f50d0..0000000
--- a/media2/media2-exoplayer/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 4.0
diff --git a/media2/media2-player/api/public_plus_experimental_current.txt b/media2/media2-player/api/public_plus_experimental_current.txt
deleted file mode 100644
index c5e968d..0000000
--- a/media2/media2-player/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-// Signature format: 4.0
-package androidx.media2.player {
-
-  public final class MediaPlayer extends androidx.media2.common.SessionPlayer {
-    ctor public MediaPlayer(android.content.Context);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> addPlaylistItem(int, androidx.media2.common.MediaItem);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> attachAuxEffect(int);
-    method public androidx.media.AudioAttributesCompat? getAudioAttributes();
-    method public int getAudioSessionId();
-    method public long getBufferedPosition();
-    method public int getBufferingState();
-    method public androidx.media2.common.MediaItem? getCurrentMediaItem();
-    method public int getCurrentMediaItemIndex();
-    method public long getCurrentPosition();
-    method public long getDuration();
-    method public float getMaxPlayerVolume();
-    method public int getNextMediaItemIndex();
-    method public androidx.media2.player.PlaybackParams getPlaybackParams();
-    method @FloatRange(from=0.0f, to=java.lang.Float.MAX_VALUE, fromInclusive=false) public float getPlaybackSpeed();
-    method public int getPlayerState();
-    method public float getPlayerVolume();
-    method public java.util.List<androidx.media2.common.MediaItem!>? getPlaylist();
-    method public androidx.media2.common.MediaMetadata? getPlaylistMetadata();
-    method public int getPreviousMediaItemIndex();
-    method public int getRepeatMode();
-    method public androidx.media2.player.MediaPlayer.TrackInfo? getSelectedTrack(int);
-    method public int getShuffleMode();
-    method public androidx.media2.player.MediaTimestamp? getTimestamp();
-    method @Deprecated public java.util.List<androidx.media2.player.MediaPlayer.TrackInfo!> getTrackInfo();
-    method public androidx.media2.player.VideoSize getVideoSize();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> pause();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> play();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> prepare();
-    method public void registerPlayerCallback(java.util.concurrent.Executor, androidx.media2.player.MediaPlayer.PlayerCallback);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> removePlaylistItem(@IntRange(from=0) int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> replacePlaylistItem(int, androidx.media2.common.MediaItem);
-    method public void reset();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> seekTo(long);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> seekTo(long, int);
-    method @Deprecated public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> selectTrack(androidx.media2.player.MediaPlayer.TrackInfo);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setAudioAttributes(androidx.media.AudioAttributesCompat);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setAudioSessionId(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setAuxEffectSendLevel(@FloatRange(from=0, to=1) float);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setMediaItem(androidx.media2.common.MediaItem);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlaybackParams(androidx.media2.player.PlaybackParams);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlaybackSpeed(@FloatRange(from=0.0f, to=java.lang.Float.MAX_VALUE, fromInclusive=false) float);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlayerVolume(@FloatRange(from=0, to=1) float);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setPlaylist(java.util.List<androidx.media2.common.MediaItem!>, androidx.media2.common.MediaMetadata?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setRepeatMode(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> setShuffleMode(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToNextPlaylistItem();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToPlaylistItem(@IntRange(from=0) int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> skipToPreviousPlaylistItem();
-    method public void unregisterPlayerCallback(androidx.media2.player.MediaPlayer.PlayerCallback);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.common.SessionPlayer.PlayerResult!> updatePlaylistMetadata(androidx.media2.common.MediaMetadata?);
-    field public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804; // 0x324
-    field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320
-    field public static final int MEDIA_INFO_BUFFERING_UPDATE = 704; // 0x2c0
-    field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322
-    field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321
-    field public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805; // 0x325
-    field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3
-    field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
-    field @Deprecated public static final int NO_TRACK_SELECTED = -2147483648; // 0x80000000
-    field public static final int PLAYER_ERROR_IO = -1004; // 0xfffffc14
-    field public static final int PLAYER_ERROR_MALFORMED = -1007; // 0xfffffc11
-    field public static final int PLAYER_ERROR_TIMED_OUT = -110; // 0xffffff92
-    field public static final int PLAYER_ERROR_UNKNOWN = 1; // 0x1
-    field public static final int PLAYER_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e
-    field public static final int SEEK_CLOSEST = 3; // 0x3
-    field public static final int SEEK_CLOSEST_SYNC = 2; // 0x2
-    field public static final int SEEK_NEXT_SYNC = 1; // 0x1
-    field public static final int SEEK_PREVIOUS_SYNC = 0; // 0x0
-  }
-
-  public abstract static class MediaPlayer.PlayerCallback extends androidx.media2.common.SessionPlayer.PlayerCallback {
-    ctor public MediaPlayer.PlayerCallback();
-    method public void onError(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, int, int);
-    method public void onInfo(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, int, int);
-    method public void onMediaTimeDiscontinuity(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, androidx.media2.player.MediaTimestamp);
-    method public void onTimedMetaDataAvailable(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, androidx.media2.player.TimedMetaData);
-    method @Deprecated public void onVideoSizeChanged(androidx.media2.player.MediaPlayer, androidx.media2.common.MediaItem, androidx.media2.player.VideoSize);
-  }
-
-  public static final class MediaPlayer.TrackInfo extends androidx.media2.common.SessionPlayer.TrackInfo implements androidx.versionedparcelable.VersionedParcelable {
-  }
-
-  public final class MediaTimestamp {
-    method public long getAnchorMediaTimeUs();
-    method public long getAnchorSystemNanoTime();
-    method public float getMediaClockRate();
-    field public static final androidx.media2.player.MediaTimestamp TIMESTAMP_UNKNOWN;
-  }
-
-  public final class PlaybackParams {
-    method public Integer? getAudioFallbackMode();
-    method public Float? getPitch();
-    method public Float? getSpeed();
-    field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0
-    field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2
-    field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1
-  }
-
-  public static final class PlaybackParams.Builder {
-    ctor public PlaybackParams.Builder();
-    ctor public PlaybackParams.Builder(androidx.media2.player.PlaybackParams);
-    method public androidx.media2.player.PlaybackParams build();
-    method public androidx.media2.player.PlaybackParams.Builder setAudioFallbackMode(int);
-    method public androidx.media2.player.PlaybackParams.Builder setPitch(@FloatRange(from=0.0f, to=java.lang.Float.MAX_VALUE, fromInclusive=false) float);
-    method public androidx.media2.player.PlaybackParams.Builder setSpeed(@FloatRange(from=0.0f, to=java.lang.Float.MAX_VALUE, fromInclusive=false) float);
-  }
-
-  public class TimedMetaData {
-    method public byte[]! getMetaData();
-    method public long getTimestamp();
-  }
-
-  public final class VideoSize extends androidx.media2.common.VideoSize {
-    ctor public VideoSize(int, int);
-  }
-
-}
-
diff --git a/media2/media2-session/api/public_plus_experimental_current.txt b/media2/media2-session/api/public_plus_experimental_current.txt
deleted file mode 100644
index 95e39e3..0000000
--- a/media2/media2-session/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,449 +0,0 @@
-// Signature format: 4.0
-package androidx.media2.session {
-
-  public final class HeartRating implements androidx.media2.common.Rating {
-    ctor public HeartRating();
-    ctor public HeartRating(boolean);
-    method public boolean hasHeart();
-    method public boolean isRated();
-  }
-
-  public class LibraryResult implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public LibraryResult(int);
-    ctor public LibraryResult(int, androidx.media2.common.MediaItem?, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    ctor public LibraryResult(int, java.util.List<androidx.media2.common.MediaItem!>?, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public long getCompletionTime();
-    method public androidx.media2.session.MediaLibraryService.LibraryParams? getLibraryParams();
-    method public androidx.media2.common.MediaItem? getMediaItem();
-    method public java.util.List<androidx.media2.common.MediaItem!>? getMediaItems();
-    method public int getResultCode();
-    field public static final int RESULT_ERROR_BAD_VALUE = -3; // 0xfffffffd
-    field public static final int RESULT_ERROR_INVALID_STATE = -2; // 0xfffffffe
-    field public static final int RESULT_ERROR_IO = -5; // 0xfffffffb
-    field public static final int RESULT_ERROR_NOT_SUPPORTED = -6; // 0xfffffffa
-    field public static final int RESULT_ERROR_PERMISSION_DENIED = -4; // 0xfffffffc
-    field public static final int RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED = -102; // 0xffffff9a
-    field public static final int RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT = -104; // 0xffffff98
-    field public static final int RESULT_ERROR_SESSION_DISCONNECTED = -100; // 0xffffff9c
-    field public static final int RESULT_ERROR_SESSION_NOT_AVAILABLE_IN_REGION = -106; // 0xffffff96
-    field public static final int RESULT_ERROR_SESSION_PARENTAL_CONTROL_RESTRICTED = -105; // 0xffffff97
-    field public static final int RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED = -103; // 0xffffff99
-    field public static final int RESULT_ERROR_SESSION_SETUP_REQUIRED = -108; // 0xffffff94
-    field public static final int RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED = -107; // 0xffffff95
-    field public static final int RESULT_ERROR_UNKNOWN = -1; // 0xffffffff
-    field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
-    field public static final int RESULT_SUCCESS = 0; // 0x0
-  }
-
-  public class MediaBrowser extends androidx.media2.session.MediaController {
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> getChildren(String, @IntRange(from=0) int, @IntRange(from=1) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> getItem(String);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> getLibraryRoot(androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> getSearchResult(String, @IntRange(from=0) int, @IntRange(from=1) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> search(String, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> subscribe(String, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.LibraryResult!> unsubscribe(String);
-  }
-
-  public static class MediaBrowser.BrowserCallback extends androidx.media2.session.MediaController.ControllerCallback {
-    ctor public MediaBrowser.BrowserCallback();
-    method public void onChildrenChanged(androidx.media2.session.MediaBrowser, String, @IntRange(from=0) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public void onSearchResultChanged(androidx.media2.session.MediaBrowser, String, @IntRange(from=0) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-  }
-
-  public static final class MediaBrowser.Builder {
-    ctor public MediaBrowser.Builder(android.content.Context);
-    method public androidx.media2.session.MediaBrowser build();
-    method public androidx.media2.session.MediaBrowser.Builder setConnectionHints(android.os.Bundle);
-    method public androidx.media2.session.MediaBrowser.Builder setControllerCallback(java.util.concurrent.Executor, androidx.media2.session.MediaBrowser.BrowserCallback);
-    method public androidx.media2.session.MediaBrowser.Builder setSessionCompatToken(android.support.v4.media.session.MediaSessionCompat.Token);
-    method public androidx.media2.session.MediaBrowser.Builder setSessionToken(androidx.media2.session.SessionToken);
-  }
-
-  public class MediaConstants {
-    field public static final String MEDIA_URI_AUTHORITY = "media2-session";
-    field public static final String MEDIA_URI_PATH_PLAY_FROM_MEDIA_ID = "playFromMediaId";
-    field public static final String MEDIA_URI_PATH_PLAY_FROM_SEARCH = "playFromSearch";
-    field public static final String MEDIA_URI_PATH_PREPARE_FROM_MEDIA_ID = "prepareFromMediaId";
-    field public static final String MEDIA_URI_PATH_PREPARE_FROM_SEARCH = "prepareFromSearch";
-    field public static final String MEDIA_URI_PATH_SET_MEDIA_URI = "setMediaUri";
-    field public static final String MEDIA_URI_QUERY_ID = "id";
-    field public static final String MEDIA_URI_QUERY_QUERY = "query";
-    field public static final String MEDIA_URI_QUERY_URI = "uri";
-    field public static final String MEDIA_URI_SCHEME = "androidx";
-  }
-
-  public class MediaController implements java.io.Closeable {
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> addPlaylistItem(@IntRange(from=0) int, String);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> adjustVolume(int, int);
-    method public void close();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> deselectTrack(androidx.media2.common.SessionPlayer.TrackInfo);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> fastForward();
-    method public androidx.media2.session.SessionCommandGroup? getAllowedCommands();
-    method public long getBufferedPosition();
-    method public int getBufferingState();
-    method public androidx.media2.session.SessionToken? getConnectedToken();
-    method public androidx.media2.common.MediaItem? getCurrentMediaItem();
-    method public int getCurrentMediaItemIndex();
-    method public long getCurrentPosition();
-    method public long getDuration();
-    method public int getNextMediaItemIndex();
-    method public androidx.media2.session.MediaController.PlaybackInfo? getPlaybackInfo();
-    method public float getPlaybackSpeed();
-    method public int getPlayerState();
-    method public java.util.List<androidx.media2.common.MediaItem!>? getPlaylist();
-    method public androidx.media2.common.MediaMetadata? getPlaylistMetadata();
-    method public int getPreviousMediaItemIndex();
-    method public int getRepeatMode();
-    method public androidx.media2.common.SessionPlayer.TrackInfo? getSelectedTrack(int);
-    method public android.app.PendingIntent? getSessionActivity();
-    method public int getShuffleMode();
-    method public java.util.List<androidx.media2.common.SessionPlayer.TrackInfo!> getTracks();
-    method public androidx.media2.common.VideoSize getVideoSize();
-    method public boolean isConnected();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> movePlaylistItem(@IntRange(from=0) int, @IntRange(from=0) int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> pause();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> play();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> prepare();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> removePlaylistItem(@IntRange(from=0) int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> replacePlaylistItem(@IntRange(from=0) int, String);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> rewind();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> seekTo(long);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> selectTrack(androidx.media2.common.SessionPlayer.TrackInfo);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> sendCustomCommand(androidx.media2.session.SessionCommand, android.os.Bundle?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setMediaItem(String);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setMediaUri(android.net.Uri, android.os.Bundle?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setPlaybackSpeed(float);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setPlaylist(java.util.List<java.lang.String!>, androidx.media2.common.MediaMetadata?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setRating(String, androidx.media2.common.Rating);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setRepeatMode(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setShuffleMode(int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setSurface(android.view.Surface?);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setVolumeTo(int, int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipBackward();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipForward();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipToNextPlaylistItem();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipToPlaylistItem(@IntRange(from=0) int);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> skipToPreviousPlaylistItem();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> updatePlaylistMetadata(androidx.media2.common.MediaMetadata?);
-  }
-
-  public static final class MediaController.Builder {
-    ctor public MediaController.Builder(android.content.Context);
-    method public androidx.media2.session.MediaController build();
-    method public androidx.media2.session.MediaController.Builder setConnectionHints(android.os.Bundle);
-    method public androidx.media2.session.MediaController.Builder setControllerCallback(java.util.concurrent.Executor, androidx.media2.session.MediaController.ControllerCallback);
-    method public androidx.media2.session.MediaController.Builder setSessionCompatToken(android.support.v4.media.session.MediaSessionCompat.Token);
-    method public androidx.media2.session.MediaController.Builder setSessionToken(androidx.media2.session.SessionToken);
-  }
-
-  public abstract static class MediaController.ControllerCallback {
-    ctor public MediaController.ControllerCallback();
-    method public void onAllowedCommandsChanged(androidx.media2.session.MediaController, androidx.media2.session.SessionCommandGroup);
-    method public void onBufferingStateChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaItem, int);
-    method public void onConnected(androidx.media2.session.MediaController, androidx.media2.session.SessionCommandGroup);
-    method public void onCurrentMediaItemChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaItem?);
-    method public androidx.media2.session.SessionResult onCustomCommand(androidx.media2.session.MediaController, androidx.media2.session.SessionCommand, android.os.Bundle?);
-    method public void onDisconnected(androidx.media2.session.MediaController);
-    method public void onPlaybackCompleted(androidx.media2.session.MediaController);
-    method public void onPlaybackInfoChanged(androidx.media2.session.MediaController, androidx.media2.session.MediaController.PlaybackInfo);
-    method public void onPlaybackSpeedChanged(androidx.media2.session.MediaController, float);
-    method public void onPlayerStateChanged(androidx.media2.session.MediaController, int);
-    method public void onPlaylistChanged(androidx.media2.session.MediaController, java.util.List<androidx.media2.common.MediaItem!>?, androidx.media2.common.MediaMetadata?);
-    method public void onPlaylistMetadataChanged(androidx.media2.session.MediaController, androidx.media2.common.MediaMetadata?);
-    method public void onRepeatModeChanged(androidx.media2.session.MediaController, int);
-    method public void onSeekCompleted(androidx.media2.session.MediaController, long);
-    method public int onSetCustomLayout(androidx.media2.session.MediaController, java.util.List<androidx.media2.session.MediaSession.CommandButton!>);
-    method public void onShuffleModeChanged(androidx.media2.session.MediaController, int);
-    method public void onSubtitleData(androidx.media2.session.MediaController, androidx.media2.common.MediaItem, androidx.media2.common.SessionPlayer.TrackInfo, androidx.media2.common.SubtitleData);
-    method public void onTrackDeselected(androidx.media2.session.MediaController, androidx.media2.common.SessionPlayer.TrackInfo);
-    method public void onTrackSelected(androidx.media2.session.MediaController, androidx.media2.common.SessionPlayer.TrackInfo);
-    method public void onTracksChanged(androidx.media2.session.MediaController, java.util.List<androidx.media2.common.SessionPlayer.TrackInfo!>);
-    method public void onVideoSizeChanged(androidx.media2.session.MediaController, androidx.media2.common.VideoSize);
-  }
-
-  public static final class MediaController.PlaybackInfo implements androidx.versionedparcelable.VersionedParcelable {
-    method public androidx.media.AudioAttributesCompat? getAudioAttributes();
-    method public int getControlType();
-    method public int getCurrentVolume();
-    method public int getMaxVolume();
-    method public int getPlaybackType();
-    field public static final int PLAYBACK_TYPE_LOCAL = 1; // 0x1
-    field public static final int PLAYBACK_TYPE_REMOTE = 2; // 0x2
-  }
-
-  public abstract class MediaLibraryService extends androidx.media2.session.MediaSessionService {
-    ctor public MediaLibraryService();
-    method public abstract androidx.media2.session.MediaLibraryService.MediaLibrarySession? onGetSession(androidx.media2.session.MediaSession.ControllerInfo);
-    field public static final String SERVICE_INTERFACE = "androidx.media2.session.MediaLibraryService";
-  }
-
-  public static final class MediaLibraryService.LibraryParams implements androidx.versionedparcelable.VersionedParcelable {
-    method public android.os.Bundle? getExtras();
-    method public boolean isOffline();
-    method public boolean isRecent();
-    method public boolean isSuggested();
-  }
-
-  public static final class MediaLibraryService.LibraryParams.Builder {
-    ctor public MediaLibraryService.LibraryParams.Builder();
-    method public androidx.media2.session.MediaLibraryService.LibraryParams build();
-    method public androidx.media2.session.MediaLibraryService.LibraryParams.Builder setExtras(android.os.Bundle?);
-    method public androidx.media2.session.MediaLibraryService.LibraryParams.Builder setOffline(boolean);
-    method public androidx.media2.session.MediaLibraryService.LibraryParams.Builder setRecent(boolean);
-    method public androidx.media2.session.MediaLibraryService.LibraryParams.Builder setSuggested(boolean);
-  }
-
-  public static final class MediaLibraryService.MediaLibrarySession extends androidx.media2.session.MediaSession {
-    method public void notifyChildrenChanged(androidx.media2.session.MediaSession.ControllerInfo, String, @IntRange(from=0) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public void notifyChildrenChanged(String, int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public void notifySearchResultChanged(androidx.media2.session.MediaSession.ControllerInfo, String, @IntRange(from=0) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-  }
-
-  public static final class MediaLibraryService.MediaLibrarySession.Builder {
-    ctor public MediaLibraryService.MediaLibrarySession.Builder(androidx.media2.session.MediaLibraryService, androidx.media2.common.SessionPlayer, java.util.concurrent.Executor, androidx.media2.session.MediaLibraryService.MediaLibrarySession.MediaLibrarySessionCallback);
-    method public androidx.media2.session.MediaLibraryService.MediaLibrarySession build();
-    method public androidx.media2.session.MediaLibraryService.MediaLibrarySession.Builder setExtras(android.os.Bundle);
-    method public androidx.media2.session.MediaLibraryService.MediaLibrarySession.Builder setId(String);
-    method public androidx.media2.session.MediaLibraryService.MediaLibrarySession.Builder setSessionActivity(android.app.PendingIntent?);
-  }
-
-  public static class MediaLibraryService.MediaLibrarySession.MediaLibrarySessionCallback extends androidx.media2.session.MediaSession.SessionCallback {
-    ctor public MediaLibraryService.MediaLibrarySession.MediaLibrarySessionCallback();
-    method public androidx.media2.session.LibraryResult onGetChildren(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String, @IntRange(from=0) int, @IntRange(from=1) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public androidx.media2.session.LibraryResult onGetItem(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String);
-    method public androidx.media2.session.LibraryResult onGetLibraryRoot(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public androidx.media2.session.LibraryResult onGetSearchResult(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String, @IntRange(from=0) int, @IntRange(from=1) int, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public int onSearch(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public int onSubscribe(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String, androidx.media2.session.MediaLibraryService.LibraryParams?);
-    method public int onUnsubscribe(androidx.media2.session.MediaLibraryService.MediaLibrarySession, androidx.media2.session.MediaSession.ControllerInfo, String);
-  }
-
-  public class MediaSession implements java.io.Closeable {
-    method public void broadcastCustomCommand(androidx.media2.session.SessionCommand, android.os.Bundle?);
-    method public void close();
-    method public java.util.List<androidx.media2.session.MediaSession.ControllerInfo!> getConnectedControllers();
-    method public String getId();
-    method public androidx.media2.common.SessionPlayer getPlayer();
-    method public android.support.v4.media.session.MediaSessionCompat.Token getSessionCompatToken();
-    method public androidx.media2.session.SessionToken getToken();
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> sendCustomCommand(androidx.media2.session.MediaSession.ControllerInfo, androidx.media2.session.SessionCommand, android.os.Bundle?);
-    method public void setAllowedCommands(androidx.media2.session.MediaSession.ControllerInfo, androidx.media2.session.SessionCommandGroup);
-    method public com.google.common.util.concurrent.ListenableFuture<androidx.media2.session.SessionResult!> setCustomLayout(androidx.media2.session.MediaSession.ControllerInfo, java.util.List<androidx.media2.session.MediaSession.CommandButton!>);
-    method public void updatePlayer(androidx.media2.common.SessionPlayer);
-  }
-
-  public static final class MediaSession.Builder {
-    ctor public MediaSession.Builder(android.content.Context, androidx.media2.common.SessionPlayer);
-    method public androidx.media2.session.MediaSession build();
-    method public androidx.media2.session.MediaSession.Builder setExtras(android.os.Bundle);
-    method public androidx.media2.session.MediaSession.Builder setId(String);
-    method public androidx.media2.session.MediaSession.Builder setSessionActivity(android.app.PendingIntent?);
-    method public androidx.media2.session.MediaSession.Builder setSessionCallback(java.util.concurrent.Executor, androidx.media2.session.MediaSession.SessionCallback);
-  }
-
-  public static final class MediaSession.CommandButton implements androidx.versionedparcelable.VersionedParcelable {
-    method public androidx.media2.session.SessionCommand? getCommand();
-    method public CharSequence? getDisplayName();
-    method public android.os.Bundle? getExtras();
-    method public int getIconResId();
-    method public boolean isEnabled();
-  }
-
-  public static final class MediaSession.CommandButton.Builder {
-    ctor public MediaSession.CommandButton.Builder();
-    method public androidx.media2.session.MediaSession.CommandButton build();
-    method public androidx.media2.session.MediaSession.CommandButton.Builder setCommand(androidx.media2.session.SessionCommand?);
-    method public androidx.media2.session.MediaSession.CommandButton.Builder setDisplayName(CharSequence?);
-    method public androidx.media2.session.MediaSession.CommandButton.Builder setEnabled(boolean);
-    method public androidx.media2.session.MediaSession.CommandButton.Builder setExtras(android.os.Bundle?);
-    method public androidx.media2.session.MediaSession.CommandButton.Builder setIconResId(int);
-  }
-
-  public static final class MediaSession.ControllerInfo {
-    method public android.os.Bundle getConnectionHints();
-    method public String getPackageName();
-    method public int getUid();
-  }
-
-  public abstract static class MediaSession.SessionCallback {
-    ctor public MediaSession.SessionCallback();
-    method public int onCommandRequest(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, androidx.media2.session.SessionCommand);
-    method public androidx.media2.session.SessionCommandGroup? onConnect(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public androidx.media2.common.MediaItem? onCreateMediaItem(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String);
-    method public androidx.media2.session.SessionResult onCustomCommand(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, androidx.media2.session.SessionCommand, android.os.Bundle?);
-    method public void onDisconnected(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public int onFastForward(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public void onPostConnect(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public int onRewind(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public int onSetMediaUri(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, android.net.Uri, android.os.Bundle?);
-    method public int onSetRating(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo, String, androidx.media2.common.Rating);
-    method public int onSkipBackward(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-    method public int onSkipForward(androidx.media2.session.MediaSession, androidx.media2.session.MediaSession.ControllerInfo);
-  }
-
-  public final class MediaSessionManager {
-    method public static androidx.media2.session.MediaSessionManager getInstance(android.content.Context);
-    method public java.util.Set<androidx.media2.session.SessionToken!> getSessionServiceTokens();
-  }
-
-  public abstract class MediaSessionService extends android.app.Service {
-    ctor public MediaSessionService();
-    method public final void addSession(androidx.media2.session.MediaSession);
-    method public final java.util.List<androidx.media2.session.MediaSession!> getSessions();
-    method @CallSuper public android.os.IBinder? onBind(android.content.Intent);
-    method public abstract androidx.media2.session.MediaSession? onGetSession(androidx.media2.session.MediaSession.ControllerInfo);
-    method public androidx.media2.session.MediaSessionService.MediaNotification? onUpdateNotification(androidx.media2.session.MediaSession);
-    method public final void removeSession(androidx.media2.session.MediaSession);
-    field public static final String SERVICE_INTERFACE = "androidx.media2.session.MediaSessionService";
-  }
-
-  public static class MediaSessionService.MediaNotification {
-    ctor public MediaSessionService.MediaNotification(int, android.app.Notification);
-    method public android.app.Notification getNotification();
-    method public int getNotificationId();
-  }
-
-  public final class PercentageRating implements androidx.media2.common.Rating {
-    ctor public PercentageRating();
-    ctor public PercentageRating(float);
-    method public float getPercentRating();
-    method public boolean isRated();
-  }
-
-  public abstract class RemoteSessionPlayer extends androidx.media2.common.SessionPlayer {
-    ctor public RemoteSessionPlayer();
-    method public abstract java.util.concurrent.Future<androidx.media2.common.SessionPlayer.PlayerResult!> adjustVolume(int);
-    method public abstract int getMaxVolume();
-    method public abstract int getVolume();
-    method public abstract int getVolumeControlType();
-    method public abstract java.util.concurrent.Future<androidx.media2.common.SessionPlayer.PlayerResult!> setVolume(int);
-    field public static final int VOLUME_CONTROL_ABSOLUTE = 2; // 0x2
-    field public static final int VOLUME_CONTROL_FIXED = 0; // 0x0
-    field public static final int VOLUME_CONTROL_RELATIVE = 1; // 0x1
-  }
-
-  public static class RemoteSessionPlayer.Callback extends androidx.media2.common.SessionPlayer.PlayerCallback {
-    ctor public RemoteSessionPlayer.Callback();
-    method public void onVolumeChanged(androidx.media2.session.RemoteSessionPlayer, int);
-  }
-
-  public final class SessionCommand implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SessionCommand(int);
-    ctor public SessionCommand(String, android.os.Bundle?);
-    method public int getCommandCode();
-    method public String? getCustomAction();
-    method public android.os.Bundle? getCustomExtras();
-    field public static final int COMMAND_CODE_CUSTOM = 0; // 0x0
-    field public static final int COMMAND_CODE_LIBRARY_GET_CHILDREN = 50003; // 0xc353
-    field public static final int COMMAND_CODE_LIBRARY_GET_ITEM = 50004; // 0xc354
-    field public static final int COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT = 50000; // 0xc350
-    field public static final int COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT = 50006; // 0xc356
-    field public static final int COMMAND_CODE_LIBRARY_SEARCH = 50005; // 0xc355
-    field public static final int COMMAND_CODE_LIBRARY_SUBSCRIBE = 50001; // 0xc351
-    field public static final int COMMAND_CODE_LIBRARY_UNSUBSCRIBE = 50002; // 0xc352
-    field public static final int COMMAND_CODE_PLAYER_ADD_PLAYLIST_ITEM = 10013; // 0x271d
-    field public static final int COMMAND_CODE_PLAYER_DESELECT_TRACK = 11002; // 0x2afa
-    field public static final int COMMAND_CODE_PLAYER_GET_CURRENT_MEDIA_ITEM = 10016; // 0x2720
-    field public static final int COMMAND_CODE_PLAYER_GET_PLAYLIST = 10005; // 0x2715
-    field public static final int COMMAND_CODE_PLAYER_GET_PLAYLIST_METADATA = 10012; // 0x271c
-    field public static final int COMMAND_CODE_PLAYER_MOVE_PLAYLIST_ITEM = 10019; // 0x2723
-    field public static final int COMMAND_CODE_PLAYER_PAUSE = 10001; // 0x2711
-    field public static final int COMMAND_CODE_PLAYER_PLAY = 10000; // 0x2710
-    field public static final int COMMAND_CODE_PLAYER_PREPARE = 10002; // 0x2712
-    field public static final int COMMAND_CODE_PLAYER_REMOVE_PLAYLIST_ITEM = 10014; // 0x271e
-    field public static final int COMMAND_CODE_PLAYER_REPLACE_PLAYLIST_ITEM = 10015; // 0x271f
-    field public static final int COMMAND_CODE_PLAYER_SEEK_TO = 10003; // 0x2713
-    field public static final int COMMAND_CODE_PLAYER_SELECT_TRACK = 11001; // 0x2af9
-    field public static final int COMMAND_CODE_PLAYER_SET_MEDIA_ITEM = 10018; // 0x2722
-    field public static final int COMMAND_CODE_PLAYER_SET_PLAYLIST = 10006; // 0x2716
-    field public static final int COMMAND_CODE_PLAYER_SET_REPEAT_MODE = 10011; // 0x271b
-    field public static final int COMMAND_CODE_PLAYER_SET_SHUFFLE_MODE = 10010; // 0x271a
-    field public static final int COMMAND_CODE_PLAYER_SET_SPEED = 10004; // 0x2714
-    field public static final int COMMAND_CODE_PLAYER_SET_SURFACE = 11000; // 0x2af8
-    field public static final int COMMAND_CODE_PLAYER_SKIP_TO_NEXT_PLAYLIST_ITEM = 10009; // 0x2719
-    field public static final int COMMAND_CODE_PLAYER_SKIP_TO_PLAYLIST_ITEM = 10007; // 0x2717
-    field public static final int COMMAND_CODE_PLAYER_SKIP_TO_PREVIOUS_PLAYLIST_ITEM = 10008; // 0x2718
-    field public static final int COMMAND_CODE_PLAYER_UPDATE_LIST_METADATA = 10017; // 0x2721
-    field public static final int COMMAND_CODE_SESSION_FAST_FORWARD = 40000; // 0x9c40
-    field public static final int COMMAND_CODE_SESSION_REWIND = 40001; // 0x9c41
-    field public static final int COMMAND_CODE_SESSION_SET_MEDIA_URI = 40011; // 0x9c4b
-    field public static final int COMMAND_CODE_SESSION_SET_RATING = 40010; // 0x9c4a
-    field public static final int COMMAND_CODE_SESSION_SKIP_BACKWARD = 40003; // 0x9c43
-    field public static final int COMMAND_CODE_SESSION_SKIP_FORWARD = 40002; // 0x9c42
-    field public static final int COMMAND_CODE_VOLUME_ADJUST_VOLUME = 30001; // 0x7531
-    field public static final int COMMAND_CODE_VOLUME_SET_VOLUME = 30000; // 0x7530
-    field public static final int COMMAND_VERSION_1 = 1; // 0x1
-    field public static final int COMMAND_VERSION_2 = 2; // 0x2
-  }
-
-  public final class SessionCommandGroup implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SessionCommandGroup();
-    ctor public SessionCommandGroup(java.util.Collection<androidx.media2.session.SessionCommand!>?);
-    method public java.util.Set<androidx.media2.session.SessionCommand!> getCommands();
-    method public boolean hasCommand(androidx.media2.session.SessionCommand);
-    method public boolean hasCommand(int);
-  }
-
-  public static final class SessionCommandGroup.Builder {
-    ctor public SessionCommandGroup.Builder();
-    ctor public SessionCommandGroup.Builder(androidx.media2.session.SessionCommandGroup);
-    method public androidx.media2.session.SessionCommandGroup.Builder addAllPredefinedCommands(int);
-    method public androidx.media2.session.SessionCommandGroup.Builder addCommand(androidx.media2.session.SessionCommand);
-    method public androidx.media2.session.SessionCommandGroup build();
-    method public androidx.media2.session.SessionCommandGroup.Builder removeCommand(androidx.media2.session.SessionCommand);
-  }
-
-  public class SessionResult implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SessionResult(int, android.os.Bundle?);
-    method public long getCompletionTime();
-    method public android.os.Bundle? getCustomCommandResult();
-    method public androidx.media2.common.MediaItem? getMediaItem();
-    method public int getResultCode();
-    field public static final int RESULT_ERROR_BAD_VALUE = -3; // 0xfffffffd
-    field public static final int RESULT_ERROR_INVALID_STATE = -2; // 0xfffffffe
-    field public static final int RESULT_ERROR_IO = -5; // 0xfffffffb
-    field public static final int RESULT_ERROR_NOT_SUPPORTED = -6; // 0xfffffffa
-    field public static final int RESULT_ERROR_PERMISSION_DENIED = -4; // 0xfffffffc
-    field public static final int RESULT_ERROR_SESSION_AUTHENTICATION_EXPIRED = -102; // 0xffffff9a
-    field public static final int RESULT_ERROR_SESSION_CONCURRENT_STREAM_LIMIT = -104; // 0xffffff98
-    field public static final int RESULT_ERROR_SESSION_DISCONNECTED = -100; // 0xffffff9c
-    field public static final int RESULT_ERROR_SESSION_NOT_AVAILABLE_IN_REGION = -106; // 0xffffff96
-    field public static final int RESULT_ERROR_SESSION_PARENTAL_CONTROL_RESTRICTED = -105; // 0xffffff97
-    field public static final int RESULT_ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED = -103; // 0xffffff99
-    field public static final int RESULT_ERROR_SESSION_SETUP_REQUIRED = -108; // 0xffffff94
-    field public static final int RESULT_ERROR_SESSION_SKIP_LIMIT_REACHED = -107; // 0xffffff95
-    field public static final int RESULT_ERROR_UNKNOWN = -1; // 0xffffffff
-    field public static final int RESULT_INFO_SKIPPED = 1; // 0x1
-    field public static final int RESULT_SUCCESS = 0; // 0x0
-  }
-
-  public final class SessionToken implements androidx.versionedparcelable.VersionedParcelable {
-    ctor public SessionToken(android.content.Context, android.content.ComponentName);
-    method public android.os.Bundle getExtras();
-    method public String getPackageName();
-    method public String? getServiceName();
-    method public int getType();
-    method public int getUid();
-    field public static final int TYPE_LIBRARY_SERVICE = 2; // 0x2
-    field public static final int TYPE_SESSION = 0; // 0x0
-    field public static final int TYPE_SESSION_SERVICE = 1; // 0x1
-  }
-
-  public final class StarRating implements androidx.media2.common.Rating {
-    ctor public StarRating(@IntRange(from=1) int);
-    ctor public StarRating(@IntRange(from=1) int, float);
-    method public int getMaxStars();
-    method public float getStarRating();
-    method public boolean isRated();
-  }
-
-  public final class ThumbRating implements androidx.media2.common.Rating {
-    ctor public ThumbRating();
-    ctor public ThumbRating(boolean);
-    method public boolean isRated();
-    method public boolean isThumbUp();
-  }
-
-}
-
diff --git a/media2/media2-widget/api/public_plus_experimental_current.txt b/media2/media2-widget/api/public_plus_experimental_current.txt
deleted file mode 100644
index c21654a..0000000
--- a/media2/media2-widget/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Signature format: 4.0
-package androidx.media2.widget {
-
-  public class MediaControlView extends android.view.ViewGroup {
-    ctor public MediaControlView(android.content.Context);
-    ctor public MediaControlView(android.content.Context, android.util.AttributeSet?);
-    ctor public MediaControlView(android.content.Context, android.util.AttributeSet?, int);
-    method public void requestPlayButtonFocus();
-    method public void setMediaController(androidx.media2.session.MediaController);
-    method public void setOnFullScreenListener(androidx.media2.widget.MediaControlView.OnFullScreenListener?);
-    method public void setPlayer(androidx.media2.common.SessionPlayer);
-  }
-
-  public static interface MediaControlView.OnFullScreenListener {
-    method public void onFullScreen(android.view.View, boolean);
-  }
-
-  public class VideoView extends android.view.ViewGroup {
-    ctor public VideoView(android.content.Context);
-    ctor public VideoView(android.content.Context, android.util.AttributeSet?);
-    ctor public VideoView(android.content.Context, android.util.AttributeSet?, int);
-    method public androidx.media2.widget.MediaControlView? getMediaControlView();
-    method public int getViewType();
-    method public void setMediaControlView(androidx.media2.widget.MediaControlView, long);
-    method public void setMediaController(androidx.media2.session.MediaController);
-    method public void setOnViewTypeChangedListener(androidx.media2.widget.VideoView.OnViewTypeChangedListener?);
-    method public void setPlayer(androidx.media2.common.SessionPlayer);
-    method public void setViewType(int);
-    field public static final int VIEW_TYPE_SURFACEVIEW = 0; // 0x0
-    field public static final int VIEW_TYPE_TEXTUREVIEW = 1; // 0x1
-  }
-
-  public static interface VideoView.OnViewTypeChangedListener {
-    method public void onViewTypeChanged(android.view.View, int);
-  }
-
-}
-
diff --git a/mediarouter/mediarouter-testing/api/public_plus_experimental_current.txt b/mediarouter/mediarouter-testing/api/public_plus_experimental_current.txt
deleted file mode 100644
index 14e1df6..0000000
--- a/mediarouter/mediarouter-testing/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 4.0
-package androidx.mediarouter.testing {
-
-  public class MediaRouterTestHelper {
-    method @MainThread public static void resetMediaRouter();
-  }
-
-}
-
diff --git a/metrics/metrics-performance/api/public_plus_experimental_current.txt b/metrics/metrics-performance/api/public_plus_experimental_current.txt
deleted file mode 100644
index 319e59a..0000000
--- a/metrics/metrics-performance/api/public_plus_experimental_current.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Signature format: 4.0
-package androidx.metrics.performance {
-
-  public class FrameData {
-    ctor public FrameData(long frameStartNanos, long frameDurationUiNanos, boolean isJank, java.util.List<androidx.metrics.performance.StateInfo> states);
-    method public androidx.metrics.performance.FrameData copy();
-    method public final long getFrameDurationUiNanos();
-    method public final long getFrameStartNanos();
-    method public final java.util.List<androidx.metrics.performance.StateInfo> getStates();
-    method public final boolean isJank();
-    property public final long frameDurationUiNanos;
-    property public final long frameStartNanos;
-    property public final boolean isJank;
-    property public final java.util.List<androidx.metrics.performance.StateInfo> states;
-  }
-
-  public class FrameDataApi24 extends androidx.metrics.performance.FrameData {
-    ctor public FrameDataApi24(long frameStartNanos, long frameDurationUiNanos, long frameDurationCpuNanos, boolean isJank, java.util.List<androidx.metrics.performance.StateInfo> states);
-    method public final long getFrameDurationCpuNanos();
-    property public final long frameDurationCpuNanos;
-  }
-
-  public final class FrameDataApi31 extends androidx.metrics.performance.FrameDataApi24 {
-    ctor public FrameDataApi31(long frameStartNanos, long frameDurationUiNanos, long frameDurationCpuNanos, long frameDurationTotalNanos, long frameOverrunNanos, boolean isJank, java.util.List<androidx.metrics.performance.StateInfo> states);
-    method public long getFrameDurationTotalNanos();
-    method public long getFrameOverrunNanos();
-    property public final long frameDurationTotalNanos;
-    property public final long frameOverrunNanos;
-  }
-
-  public final class JankStats {
-    method @UiThread public static androidx.metrics.performance.JankStats createAndTrack(android.view.Window window, androidx.metrics.performance.JankStats.OnFrameListener frameListener);
-    method public float getJankHeuristicMultiplier();
-    method public boolean isTrackingEnabled();
-    method public void setJankHeuristicMultiplier(float);
-    method @UiThread public void setTrackingEnabled(boolean);
-    property public final boolean isTrackingEnabled;
-    property public final float jankHeuristicMultiplier;
-    field public static final androidx.metrics.performance.JankStats.Companion Companion;
-  }
-
-  public static final class JankStats.Companion {
-    method @UiThread public androidx.metrics.performance.JankStats createAndTrack(android.view.Window window, androidx.metrics.performance.JankStats.OnFrameListener frameListener);
-  }
-
-  public static fun interface JankStats.OnFrameListener {
-    method public void onFrame(androidx.metrics.performance.FrameData volatileFrameData);
-  }
-
-  public final class PerformanceMetricsState {
-    method @UiThread public static androidx.metrics.performance.PerformanceMetricsState.Holder getHolderForHierarchy(android.view.View view);
-    method public void putSingleFrameState(String key, String value);
-    method public void putState(String key, String value);
-    method public void removeState(String key);
-    field public static final androidx.metrics.performance.PerformanceMetricsState.Companion Companion;
-  }
-
-  public static final class PerformanceMetricsState.Companion {
-    method @UiThread public androidx.metrics.performance.PerformanceMetricsState.Holder getHolderForHierarchy(android.view.View view);
-  }
-
-  public static final class PerformanceMetricsState.Holder {
-    method public androidx.metrics.performance.PerformanceMetricsState? getState();
-    property public final androidx.metrics.performance.PerformanceMetricsState? state;
-  }
-
-  public final class StateInfo {
-    ctor public StateInfo(String key, String value);
-    method public String getKey();
-    method public String getValue();
-    property public final String key;
-    property public final String value;
-  }
-
-}
-
diff --git a/playground-common/androidx-shared.properties b/playground-common/androidx-shared.properties
index 46a9e68..ae073c5 100644
--- a/playground-common/androidx-shared.properties
+++ b/playground-common/androidx-shared.properties
@@ -58,8 +58,8 @@
 androidx.suppress.compatibility.optin.defg=d,e,f,g
 
 # Third stage of Suppress Compatibility migration
-# androidx.suppress.compatibility.optout.hijklm=
-# androidx.suppress.compatibility.optin.hijklm=h,i,j,k,l,m
+androidx.suppress.compatibility.optout.hijklm=health/connect/connect-client/,heifwriter/heifwriter/,hilt/hilt-navigation-fragment/,media/media/,mediarouter/mediarouter/
+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/