Add previously excluded properties to signatures

API changes corresponding to metalava change aosp/3312459

Bug: 369846185
Test: ./gradlew checkApi
Relnote: N/A
Merged-In: I4f96d755877bb25396105bc3ff35f5bc60ce0592
Change-Id: I4f96d755877bb25396105bc3ff35f5bc60ce0592
diff --git a/activity/activity/api/current.txt b/activity/activity/api/current.txt
index f29bd71..3f67ead 100644
--- a/activity/activity/api/current.txt
+++ b/activity/activity/api/current.txt
@@ -24,6 +24,8 @@
   }
 
   public static final class BackEventCompat.Companion {
+    property public static final int EDGE_LEFT;
+    property public static final int EDGE_RIGHT;
   }
 
   public class ComponentActivity extends android.app.Activity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.activity.FullyDrawnReporterOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.core.view.MenuHost androidx.activity.OnBackPressedDispatcherOwner androidx.core.content.OnConfigurationChangedProvider androidx.core.app.OnMultiWindowModeChangedProvider androidx.core.app.OnNewIntentProvider androidx.core.app.OnPictureInPictureModeChangedProvider androidx.core.content.OnTrimMemoryProvider androidx.core.app.OnUserLeaveHintProvider androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
@@ -227,6 +229,7 @@
 
   public static final class ActivityResult.Companion {
     method public String resultCodeToString(int resultCode);
+    property public final android.os.Parcelable.Creator<androidx.activity.result.ActivityResult> CREATOR;
   }
 
   public fun interface ActivityResultCallback<O> {
@@ -302,6 +305,7 @@
   }
 
   public static final class IntentSenderRequest.Companion {
+    property public final android.os.Parcelable.Creator<androidx.activity.result.IntentSenderRequest> CREATOR;
   }
 
   public final class PickVisualMediaRequest {
@@ -438,6 +442,11 @@
   public static final class ActivityResultContracts.PickVisualMedia.Companion {
     method @Deprecated public boolean isPhotoPickerAvailable();
     method public boolean isPhotoPickerAvailable(android.content.Context context);
+    property public static final String ACTION_SYSTEM_FALLBACK_PICK_IMAGES;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_ACCENT_COLOR;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_IN_ORDER;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_LAUNCH_TAB;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_MAX;
   }
 
   public abstract static class ActivityResultContracts.PickVisualMedia.DefaultTab {
@@ -490,6 +499,9 @@
   }
 
   public static final class ActivityResultContracts.RequestMultiplePermissions.Companion {
+    property public static final String ACTION_REQUEST_PERMISSIONS;
+    property public static final String EXTRA_PERMISSIONS;
+    property public static final String EXTRA_PERMISSION_GRANT_RESULTS;
   }
 
   public static final class ActivityResultContracts.RequestPermission extends androidx.activity.result.contract.ActivityResultContract<java.lang.String,java.lang.Boolean> {
@@ -508,6 +520,7 @@
   }
 
   public static final class ActivityResultContracts.StartActivityForResult.Companion {
+    property public static final String EXTRA_ACTIVITY_OPTIONS_BUNDLE;
   }
 
   public static final class ActivityResultContracts.StartIntentSenderForResult extends androidx.activity.result.contract.ActivityResultContract<androidx.activity.result.IntentSenderRequest,androidx.activity.result.ActivityResult> {
@@ -521,6 +534,9 @@
   }
 
   public static final class ActivityResultContracts.StartIntentSenderForResult.Companion {
+    property public static final String ACTION_INTENT_SENDER_REQUEST;
+    property public static final String EXTRA_INTENT_SENDER_REQUEST;
+    property public static final String EXTRA_SEND_INTENT_EXCEPTION;
   }
 
   public static class ActivityResultContracts.TakePicture extends androidx.activity.result.contract.ActivityResultContract<android.net.Uri,java.lang.Boolean> {
diff --git a/activity/activity/api/restricted_current.txt b/activity/activity/api/restricted_current.txt
index a44e581..81db1c5 100644
--- a/activity/activity/api/restricted_current.txt
+++ b/activity/activity/api/restricted_current.txt
@@ -24,6 +24,8 @@
   }
 
   public static final class BackEventCompat.Companion {
+    property public static final int EDGE_LEFT;
+    property public static final int EDGE_RIGHT;
   }
 
   public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.activity.result.ActivityResultCaller androidx.activity.result.ActivityResultRegistryOwner androidx.activity.contextaware.ContextAware androidx.activity.FullyDrawnReporterOwner androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.core.view.MenuHost androidx.activity.OnBackPressedDispatcherOwner androidx.core.content.OnConfigurationChangedProvider androidx.core.app.OnMultiWindowModeChangedProvider androidx.core.app.OnNewIntentProvider androidx.core.app.OnPictureInPictureModeChangedProvider androidx.core.content.OnTrimMemoryProvider androidx.core.app.OnUserLeaveHintProvider androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
@@ -226,6 +228,7 @@
 
   public static final class ActivityResult.Companion {
     method public String resultCodeToString(int resultCode);
+    property public final android.os.Parcelable.Creator<androidx.activity.result.ActivityResult> CREATOR;
   }
 
   public fun interface ActivityResultCallback<O> {
@@ -301,6 +304,7 @@
   }
 
   public static final class IntentSenderRequest.Companion {
+    property public final android.os.Parcelable.Creator<androidx.activity.result.IntentSenderRequest> CREATOR;
   }
 
   public final class PickVisualMediaRequest {
@@ -437,6 +441,11 @@
   public static final class ActivityResultContracts.PickVisualMedia.Companion {
     method @Deprecated public boolean isPhotoPickerAvailable();
     method public boolean isPhotoPickerAvailable(android.content.Context context);
+    property public static final String ACTION_SYSTEM_FALLBACK_PICK_IMAGES;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_ACCENT_COLOR;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_IN_ORDER;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_LAUNCH_TAB;
+    property public static final String EXTRA_SYSTEM_FALLBACK_PICK_IMAGES_MAX;
   }
 
   public abstract static class ActivityResultContracts.PickVisualMedia.DefaultTab {
@@ -489,6 +498,9 @@
   }
 
   public static final class ActivityResultContracts.RequestMultiplePermissions.Companion {
+    property public static final String ACTION_REQUEST_PERMISSIONS;
+    property public static final String EXTRA_PERMISSIONS;
+    property public static final String EXTRA_PERMISSION_GRANT_RESULTS;
   }
 
   public static final class ActivityResultContracts.RequestPermission extends androidx.activity.result.contract.ActivityResultContract<java.lang.String,java.lang.Boolean> {
@@ -507,6 +519,7 @@
   }
 
   public static final class ActivityResultContracts.StartActivityForResult.Companion {
+    property public static final String EXTRA_ACTIVITY_OPTIONS_BUNDLE;
   }
 
   public static final class ActivityResultContracts.StartIntentSenderForResult extends androidx.activity.result.contract.ActivityResultContract<androidx.activity.result.IntentSenderRequest,androidx.activity.result.ActivityResult> {
@@ -520,6 +533,9 @@
   }
 
   public static final class ActivityResultContracts.StartIntentSenderForResult.Companion {
+    property public static final String ACTION_INTENT_SENDER_REQUEST;
+    property public static final String EXTRA_INTENT_SENDER_REQUEST;
+    property public static final String EXTRA_SEND_INTENT_EXCEPTION;
   }
 
   public static class ActivityResultContracts.TakePicture extends androidx.activity.result.contract.ActivityResultContract<android.net.Uri,java.lang.Boolean> {
diff --git a/annotation/annotation/api/current.txt b/annotation/annotation/api/current.txt
index 9ad72d1..cad5eb84 100644
--- a/annotation/annotation/api/current.txt
+++ b/annotation/annotation/api/current.txt
@@ -78,6 +78,9 @@
   }
 
   public static final class Dimension.Companion {
+    property public static final int DP;
+    property public static final int PX;
+    property public static final int SP;
     field public static final int DP = 0; // 0x0
     field public static final int PX = 1; // 0x1
     field public static final int SP = 2; // 0x2
@@ -262,6 +265,8 @@
 
   @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER, kotlin.annotation.AnnotationTarget.CONSTRUCTOR, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FILE}) public static @interface RequiresExtension.Container {
     method public abstract androidx.annotation.RequiresExtension[] value();
+    property @IntRange(from=1L) public abstract int extension;
+    property @IntRange(from=1L) public abstract int version;
   }
 
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER, kotlin.annotation.AnnotationTarget.CONSTRUCTOR}) public @interface RequiresFeature {
@@ -356,6 +361,10 @@
   }
 
   public static final class VisibleForTesting.Companion {
+    property public static final int NONE;
+    property public static final int PACKAGE_PRIVATE;
+    property public static final int PRIVATE;
+    property public static final int PROTECTED;
     field public static final int NONE = 5; // 0x5
     field public static final int PACKAGE_PRIVATE = 3; // 0x3
     field public static final int PRIVATE = 2; // 0x2
diff --git a/annotation/annotation/api/restricted_current.txt b/annotation/annotation/api/restricted_current.txt
index 9ad72d1..cad5eb84 100644
--- a/annotation/annotation/api/restricted_current.txt
+++ b/annotation/annotation/api/restricted_current.txt
@@ -78,6 +78,9 @@
   }
 
   public static final class Dimension.Companion {
+    property public static final int DP;
+    property public static final int PX;
+    property public static final int SP;
     field public static final int DP = 0; // 0x0
     field public static final int PX = 1; // 0x1
     field public static final int SP = 2; // 0x2
@@ -262,6 +265,8 @@
 
   @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.PACKAGE}) @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER, kotlin.annotation.AnnotationTarget.CONSTRUCTOR, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FILE}) public static @interface RequiresExtension.Container {
     method public abstract androidx.annotation.RequiresExtension[] value();
+    property @IntRange(from=1L) public abstract int extension;
+    property @IntRange(from=1L) public abstract int version;
   }
 
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FIELD, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER, kotlin.annotation.AnnotationTarget.CONSTRUCTOR}) public @interface RequiresFeature {
@@ -356,6 +361,10 @@
   }
 
   public static final class VisibleForTesting.Companion {
+    property public static final int NONE;
+    property public static final int PACKAGE_PRIVATE;
+    property public static final int PRIVATE;
+    property public static final int PROTECTED;
     field public static final int NONE = 5; // 0x5
     field public static final int PACKAGE_PRIVATE = 3; // 0x3
     field public static final int PRIVATE = 2; // 0x2
diff --git a/benchmark/benchmark-common/api/current.txt b/benchmark/benchmark-common/api/current.txt
index a1c6e7b..71e919b 100644
--- a/benchmark/benchmark-common/api/current.txt
+++ b/benchmark/benchmark-common/api/current.txt
@@ -82,6 +82,7 @@
   }
 
   public static final class ProfilerConfig.MethodTracing.Companion {
+    property public final boolean AFFECTS_MEASUREMENTS_ON_THIS_DEVICE;
   }
 
   public static final class ProfilerConfig.StackSampling extends androidx.benchmark.ProfilerConfig {
diff --git a/benchmark/benchmark-common/api/restricted_current.txt b/benchmark/benchmark-common/api/restricted_current.txt
index d661084..ce0b56a 100644
--- a/benchmark/benchmark-common/api/restricted_current.txt
+++ b/benchmark/benchmark-common/api/restricted_current.txt
@@ -9,6 +9,7 @@
     method public void pauseTiming();
     method @SuppressCompatibility @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public static void reportData(String className, String testName, @IntRange(from=0L) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0L) int warmupIterations, @IntRange(from=0L) long thermalThrottleSleepSeconds, @IntRange(from=1L) int repeatIterations);
     method public void resumeTiming();
+    property @kotlin.PublishedApi internal final int iterationsRemaining;
     field public static final androidx.benchmark.BenchmarkState.Companion Companion;
     field @kotlin.PublishedApi internal int iterationsRemaining;
   }
@@ -84,6 +85,7 @@
   }
 
   public static final class ProfilerConfig.MethodTracing.Companion {
+    property public final boolean AFFECTS_MEASUREMENTS_ON_THIS_DEVICE;
   }
 
   public static final class ProfilerConfig.StackSampling extends androidx.benchmark.ProfilerConfig {
diff --git a/benchmark/benchmark-macro/api/current.txt b/benchmark/benchmark-macro/api/current.txt
index c0eda42..8a32286 100644
--- a/benchmark/benchmark-macro/api/current.txt
+++ b/benchmark/benchmark-macro/api/current.txt
@@ -17,6 +17,7 @@
   }
 
   public static final class CompilationMode.Companion {
+    property public final androidx.benchmark.macro.CompilationMode DEFAULT;
   }
 
   public static final class CompilationMode.Full extends androidx.benchmark.macro.CompilationMode {
diff --git a/benchmark/benchmark-macro/api/restricted_current.txt b/benchmark/benchmark-macro/api/restricted_current.txt
index 6fc1250..cdc08f1 100644
--- a/benchmark/benchmark-macro/api/restricted_current.txt
+++ b/benchmark/benchmark-macro/api/restricted_current.txt
@@ -22,6 +22,7 @@
   }
 
   public static final class CompilationMode.Companion {
+    property public final androidx.benchmark.macro.CompilationMode DEFAULT;
   }
 
   public static final class CompilationMode.Full extends androidx.benchmark.macro.CompilationMode {
diff --git a/bluetooth/bluetooth/api/current.txt b/bluetooth/bluetooth/api/current.txt
index 07fb495..2ee731c 100644
--- a/bluetooth/bluetooth/api/current.txt
+++ b/bluetooth/bluetooth/api/current.txt
@@ -12,6 +12,10 @@
   }
 
   public static final class AdvertiseException.Companion {
+    property public static final int DATA_TOO_LARGE;
+    property public static final int INTERNAL_ERROR;
+    property public static final int TOO_MANY_ADVERTISERS;
+    property public static final int UNSUPPORTED;
   }
 
   public final class AdvertiseParams {
@@ -52,6 +56,11 @@
   }
 
   public static final class BluetoothAddress.Companion {
+    property public static final int ADDRESS_TYPE_PUBLIC;
+    property public static final int ADDRESS_TYPE_RANDOM_NON_RESOLVABLE;
+    property public static final int ADDRESS_TYPE_RANDOM_RESOLVABLE;
+    property public static final int ADDRESS_TYPE_RANDOM_STATIC;
+    property public static final int ADDRESS_TYPE_UNKNOWN;
   }
 
   public final class BluetoothDevice {
@@ -78,6 +87,13 @@
   }
 
   public static final class BluetoothException.Companion {
+    property public static final int BLUETOOTH_NOT_ALLOWED;
+    property public static final int BLUETOOTH_NOT_ENABLED;
+    property public static final int DEVICE_NOT_BONDED;
+    property public static final int DEVICE_NOT_CONNECTED;
+    property public static final int ERROR_UNKNOWN;
+    property public static final int FEATURE_NOT_CONFIGURED;
+    property public static final int FEATURE_NOT_SUPPORTED;
   }
 
   public final class BluetoothLe {
@@ -91,6 +107,7 @@
   }
 
   public static final class BluetoothLe.Companion {
+    property public static final int ADVERTISE_STARTED;
   }
 
   public final class GattCharacteristic {
@@ -111,6 +128,14 @@
   }
 
   public static final class GattCharacteristic.Companion {
+    property public static final int PROPERTY_BROADCAST;
+    property public static final int PROPERTY_EXTENDED_PROPS;
+    property public static final int PROPERTY_INDICATE;
+    property public static final int PROPERTY_NOTIFY;
+    property public static final int PROPERTY_READ;
+    property public static final int PROPERTY_SIGNED_WRITE;
+    property public static final int PROPERTY_WRITE;
+    property public static final int PROPERTY_WRITE_NO_RESPONSE;
   }
 
   public interface GattClientScope {
@@ -192,6 +217,11 @@
   }
 
   public static final class ScanException.Companion {
+    property public static final int APPLICATION_REGISTRATION_FAILED;
+    property public static final int INTERNAL_ERROR;
+    property public static final int OUT_OF_HARDWARE_RESOURCES;
+    property public static final int SCANNING_TOO_FREQUENTLY;
+    property public static final int UNSUPPORTED;
   }
 
   public final class ScanFilter {
@@ -226,6 +256,7 @@
   }
 
   public static final class ScanFilter.Companion {
+    property public static final int MANUFACTURER_FILTER_NONE;
   }
 
   public final class ScanResult {
@@ -253,6 +284,7 @@
   }
 
   public static final class ScanResult.Companion {
+    property public static final int PERIODIC_INTERVAL_NOT_PRESENT;
   }
 
 }
diff --git a/bluetooth/bluetooth/api/restricted_current.txt b/bluetooth/bluetooth/api/restricted_current.txt
index 07fb495..2ee731c 100644
--- a/bluetooth/bluetooth/api/restricted_current.txt
+++ b/bluetooth/bluetooth/api/restricted_current.txt
@@ -12,6 +12,10 @@
   }
 
   public static final class AdvertiseException.Companion {
+    property public static final int DATA_TOO_LARGE;
+    property public static final int INTERNAL_ERROR;
+    property public static final int TOO_MANY_ADVERTISERS;
+    property public static final int UNSUPPORTED;
   }
 
   public final class AdvertiseParams {
@@ -52,6 +56,11 @@
   }
 
   public static final class BluetoothAddress.Companion {
+    property public static final int ADDRESS_TYPE_PUBLIC;
+    property public static final int ADDRESS_TYPE_RANDOM_NON_RESOLVABLE;
+    property public static final int ADDRESS_TYPE_RANDOM_RESOLVABLE;
+    property public static final int ADDRESS_TYPE_RANDOM_STATIC;
+    property public static final int ADDRESS_TYPE_UNKNOWN;
   }
 
   public final class BluetoothDevice {
@@ -78,6 +87,13 @@
   }
 
   public static final class BluetoothException.Companion {
+    property public static final int BLUETOOTH_NOT_ALLOWED;
+    property public static final int BLUETOOTH_NOT_ENABLED;
+    property public static final int DEVICE_NOT_BONDED;
+    property public static final int DEVICE_NOT_CONNECTED;
+    property public static final int ERROR_UNKNOWN;
+    property public static final int FEATURE_NOT_CONFIGURED;
+    property public static final int FEATURE_NOT_SUPPORTED;
   }
 
   public final class BluetoothLe {
@@ -91,6 +107,7 @@
   }
 
   public static final class BluetoothLe.Companion {
+    property public static final int ADVERTISE_STARTED;
   }
 
   public final class GattCharacteristic {
@@ -111,6 +128,14 @@
   }
 
   public static final class GattCharacteristic.Companion {
+    property public static final int PROPERTY_BROADCAST;
+    property public static final int PROPERTY_EXTENDED_PROPS;
+    property public static final int PROPERTY_INDICATE;
+    property public static final int PROPERTY_NOTIFY;
+    property public static final int PROPERTY_READ;
+    property public static final int PROPERTY_SIGNED_WRITE;
+    property public static final int PROPERTY_WRITE;
+    property public static final int PROPERTY_WRITE_NO_RESPONSE;
   }
 
   public interface GattClientScope {
@@ -192,6 +217,11 @@
   }
 
   public static final class ScanException.Companion {
+    property public static final int APPLICATION_REGISTRATION_FAILED;
+    property public static final int INTERNAL_ERROR;
+    property public static final int OUT_OF_HARDWARE_RESOURCES;
+    property public static final int SCANNING_TOO_FREQUENTLY;
+    property public static final int UNSUPPORTED;
   }
 
   public final class ScanFilter {
@@ -226,6 +256,7 @@
   }
 
   public static final class ScanFilter.Companion {
+    property public static final int MANUFACTURER_FILTER_NONE;
   }
 
   public final class ScanResult {
@@ -253,6 +284,7 @@
   }
 
   public static final class ScanResult.Companion {
+    property public static final int PERIODIC_INTERVAL_NOT_PRESENT;
   }
 
 }
diff --git a/camera/camera-testing/api/current.txt b/camera/camera-testing/api/current.txt
index a55b2f7..80ede58 100644
--- a/camera/camera-testing/api/current.txt
+++ b/camera/camera-testing/api/current.txt
@@ -180,6 +180,9 @@
     method public androidx.camera.testing.imagecapture.CaptureResult failedResult();
     method public androidx.camera.testing.imagecapture.CaptureResult successfulResult();
     method public androidx.camera.testing.imagecapture.CaptureResult successfulResult(optional androidx.camera.testing.fakes.FakeCameraCaptureResult fakeCameraCaptureResult);
+    property public static final int CAPTURE_STATUS_CANCELLED;
+    property public static final int CAPTURE_STATUS_FAILED;
+    property public static final int CAPTURE_STATUS_SUCCESSFUL;
   }
 
 }
diff --git a/camera/camera-testing/api/restricted_current.txt b/camera/camera-testing/api/restricted_current.txt
index a55b2f7..80ede58 100644
--- a/camera/camera-testing/api/restricted_current.txt
+++ b/camera/camera-testing/api/restricted_current.txt
@@ -180,6 +180,9 @@
     method public androidx.camera.testing.imagecapture.CaptureResult failedResult();
     method public androidx.camera.testing.imagecapture.CaptureResult successfulResult();
     method public androidx.camera.testing.imagecapture.CaptureResult successfulResult(optional androidx.camera.testing.fakes.FakeCameraCaptureResult fakeCameraCaptureResult);
+    property public static final int CAPTURE_STATUS_CANCELLED;
+    property public static final int CAPTURE_STATUS_FAILED;
+    property public static final int CAPTURE_STATUS_SUCCESSFUL;
   }
 
 }
diff --git a/camera/viewfinder/viewfinder-core/api/current.txt b/camera/viewfinder/viewfinder-core/api/current.txt
index b4308b3..cfdcbac 100644
--- a/camera/viewfinder/viewfinder-core/api/current.txt
+++ b/camera/viewfinder/viewfinder-core/api/current.txt
@@ -71,6 +71,8 @@
   }
 
   public static final class ViewfinderSurfaceRequest.Companion {
+    property public static final int MIRROR_MODE_HORIZONTAL;
+    property public static final int MIRROR_MODE_NONE;
   }
 
   @com.google.auto.value.AutoValue public static final class ViewfinderSurfaceRequest.Result {
@@ -91,6 +93,11 @@
   }
 
   public static final class ViewfinderSurfaceRequest.Result.Companion {
+    property public static final int RESULT_INVALID_SURFACE;
+    property public static final int RESULT_REQUEST_CANCELLED;
+    property public static final int RESULT_SURFACE_ALREADY_PROVIDED;
+    property public static final int RESULT_SURFACE_USED_SUCCESSFULLY;
+    property public static final int RESULT_WILL_NOT_PROVIDE_SURFACE;
   }
 
   public final class ViewfinderSurfaceRequestUtil {
diff --git a/camera/viewfinder/viewfinder-core/api/restricted_current.txt b/camera/viewfinder/viewfinder-core/api/restricted_current.txt
index b4308b3..cfdcbac 100644
--- a/camera/viewfinder/viewfinder-core/api/restricted_current.txt
+++ b/camera/viewfinder/viewfinder-core/api/restricted_current.txt
@@ -71,6 +71,8 @@
   }
 
   public static final class ViewfinderSurfaceRequest.Companion {
+    property public static final int MIRROR_MODE_HORIZONTAL;
+    property public static final int MIRROR_MODE_NONE;
   }
 
   @com.google.auto.value.AutoValue public static final class ViewfinderSurfaceRequest.Result {
@@ -91,6 +93,11 @@
   }
 
   public static final class ViewfinderSurfaceRequest.Result.Companion {
+    property public static final int RESULT_INVALID_SURFACE;
+    property public static final int RESULT_REQUEST_CANCELLED;
+    property public static final int RESULT_SURFACE_ALREADY_PROVIDED;
+    property public static final int RESULT_SURFACE_USED_SUCCESSFULLY;
+    property public static final int RESULT_WILL_NOT_PROVIDE_SURFACE;
   }
 
   public final class ViewfinderSurfaceRequestUtil {
diff --git a/collection/collection/api/current.txt b/collection/collection/api/current.txt
index 8ed5cc55..025cfaa 100644
--- a/collection/collection/api/current.txt
+++ b/collection/collection/api/current.txt
@@ -224,6 +224,7 @@
     method public inline float getFirst();
     method public inline float getSecond();
     property public final inline float first;
+    property public final long packedValue;
     property public final inline float second;
     field public final long packedValue;
   }
@@ -621,6 +622,7 @@
     method public int getFirst();
     method public int getSecond();
     property public final int first;
+    property public final long packedValue;
     property public final int second;
     field public final long packedValue;
   }
diff --git a/collection/collection/api/restricted_current.txt b/collection/collection/api/restricted_current.txt
index 467a1ef..60ec475 100644
--- a/collection/collection/api/restricted_current.txt
+++ b/collection/collection/api/restricted_current.txt
@@ -142,6 +142,8 @@
     method public final int lastIndexOf(double element);
     method public final inline boolean none();
     method public final inline boolean reversedAny(kotlin.jvm.functions.Function1<? super java.lang.Double,java.lang.Boolean> predicate);
+    property @kotlin.PublishedApi internal final int _size;
+    property @kotlin.PublishedApi internal final double[] content;
     property public final inline kotlin.ranges.IntRange indices;
     property @IntRange(from=-1L) public final inline int lastIndex;
     property @IntRange(from=0L) public final inline int size;
@@ -200,7 +202,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final float[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final float[] values;
     field @kotlin.PublishedApi internal float[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal float[] values;
@@ -231,6 +236,7 @@
     method public inline float getFirst();
     method public inline float getSecond();
     property public final inline float first;
+    property public final long packedValue;
     property public final inline float second;
     field public final long packedValue;
   }
@@ -270,7 +276,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Integer,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final float[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final int[] values;
     field @kotlin.PublishedApi internal float[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal int[] values;
@@ -342,6 +351,8 @@
     method public final int lastIndexOf(float element);
     method public final inline boolean none();
     method public final inline boolean reversedAny(kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> predicate);
+    property @kotlin.PublishedApi internal final int _size;
+    property @kotlin.PublishedApi internal final float[] content;
     property public final inline kotlin.ranges.IntRange indices;
     property @IntRange(from=-1L) public final inline int lastIndex;
     property @IntRange(from=0L) public final inline int size;
@@ -400,7 +411,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Long,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final float[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final long[] values;
     field @kotlin.PublishedApi internal float[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal long[] values;
@@ -458,7 +472,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Float,? super V,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final float[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final Object?[] values;
     field @kotlin.PublishedApi internal float[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal Object?[] values;
@@ -511,6 +528,8 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function1<? super java.lang.Float,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property @IntRange(from=0L) public final int capacity;
+    property @kotlin.PublishedApi internal final float[] elements;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property @IntRange(from=0L) public final int size;
     field @kotlin.PublishedApi internal float[] elements;
     field @kotlin.PublishedApi internal long[] metadata;
@@ -567,7 +586,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Float,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final int[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final float[] values;
     field @kotlin.PublishedApi internal int[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal float[] values;
@@ -626,7 +648,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final int[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final int[] values;
     field @kotlin.PublishedApi internal int[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal int[] values;
@@ -657,6 +682,7 @@
     method public int getFirst();
     method public int getSecond();
     property public final int first;
+    property public final long packedValue;
     property public final int second;
     field public final long packedValue;
   }
@@ -709,6 +735,8 @@
     method public final int lastIndexOf(int element);
     method public final inline boolean none();
     method public final inline boolean reversedAny(kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Boolean> predicate);
+    property @kotlin.PublishedApi internal final int _size;
+    property @kotlin.PublishedApi internal final int[] content;
     property public final inline kotlin.ranges.IntRange indices;
     property @IntRange(from=-1L) public final inline int lastIndex;
     property @IntRange(from=0L) public final inline int size;
@@ -767,7 +795,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Long,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final int[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final long[] values;
     field @kotlin.PublishedApi internal int[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal long[] values;
@@ -825,7 +856,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Integer,? super V,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final int[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final Object?[] values;
     field @kotlin.PublishedApi internal int[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal Object?[] values;
@@ -878,6 +912,8 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property @IntRange(from=0L) public final int capacity;
+    property @kotlin.PublishedApi internal final int[] elements;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property @IntRange(from=0L) public final int size;
     field @kotlin.PublishedApi internal int[] elements;
     field @kotlin.PublishedApi internal long[] metadata;
@@ -934,7 +970,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Long,? super java.lang.Float,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final long[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final float[] values;
     field @kotlin.PublishedApi internal long[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal float[] values;
@@ -993,7 +1032,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Long,? super java.lang.Integer,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final long[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final int[] values;
     field @kotlin.PublishedApi internal long[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal int[] values;
@@ -1065,6 +1107,8 @@
     method public final int lastIndexOf(long element);
     method public final inline boolean none();
     method public final inline boolean reversedAny(kotlin.jvm.functions.Function1<? super java.lang.Long,java.lang.Boolean> predicate);
+    property @kotlin.PublishedApi internal final int _size;
+    property @kotlin.PublishedApi internal final long[] content;
     property public final inline kotlin.ranges.IntRange indices;
     property @IntRange(from=-1L) public final inline int lastIndex;
     property @IntRange(from=0L) public final inline int size;
@@ -1123,7 +1167,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Long,? super java.lang.Long,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final long[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final long[] values;
     field @kotlin.PublishedApi internal long[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal long[] values;
@@ -1191,7 +1238,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super java.lang.Long,? super V,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final long[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final Object?[] values;
     field @kotlin.PublishedApi internal long[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal Object?[] values;
@@ -1244,6 +1294,8 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function1<? super java.lang.Long,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property @IntRange(from=0L) public final int capacity;
+    property @kotlin.PublishedApi internal final long[] elements;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property @IntRange(from=0L) public final int size;
     field @kotlin.PublishedApi internal long[] elements;
     field @kotlin.PublishedApi internal long[] metadata;
@@ -2040,7 +2092,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super K,? super java.lang.Float,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final float[] values;
     field @kotlin.PublishedApi internal Object?[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal float[] values;
@@ -2099,7 +2154,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super K,? super java.lang.Integer,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final int[] values;
     field @kotlin.PublishedApi internal Object?[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal int[] values;
@@ -2171,6 +2229,8 @@
     method public final inline E? lastOrNull(kotlin.jvm.functions.Function1<? super E,java.lang.Boolean> predicate);
     method public final boolean none();
     method public final inline boolean reversedAny(kotlin.jvm.functions.Function1<? super E,java.lang.Boolean> predicate);
+    property @kotlin.PublishedApi internal final int _size;
+    property @kotlin.PublishedApi internal final Object?[] content;
     property public final inline kotlin.ranges.IntRange indices;
     property @IntRange(from=-1L) public final inline int lastIndex;
     property @IntRange(from=0L) public final int size;
@@ -2227,7 +2287,10 @@
     method public final inline String joinToString(kotlin.jvm.functions.Function2<? super K,? super java.lang.Long,? extends java.lang.CharSequence> transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final long[] values;
     field @kotlin.PublishedApi internal Object?[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal long[] values;
@@ -2283,7 +2346,12 @@
     method @kotlin.PublishedApi internal final inline void unorderedForEach(kotlin.jvm.functions.Function1<? super E,kotlin.Unit> block);
     method @kotlin.PublishedApi internal final inline void unorderedForEachIndex(kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> block);
     property @IntRange(from=0L) public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] elements;
+    property @kotlin.PublishedApi internal final int head;
+    property @kotlin.PublishedApi internal final long[] metadata;
+    property @kotlin.PublishedApi internal final long[] nodes;
     property @IntRange(from=0L) public final int size;
+    property @kotlin.PublishedApi internal final int tail;
     field @kotlin.PublishedApi internal Object?[] elements;
     field @kotlin.PublishedApi internal int head;
     field @kotlin.PublishedApi internal long[] metadata;
@@ -2335,7 +2403,10 @@
     method public final String joinToString(optional CharSequence separator, optional CharSequence prefix, optional CharSequence postfix, optional int limit, optional CharSequence truncated, optional kotlin.jvm.functions.Function2<? super K,? super V,? extends java.lang.CharSequence>? transform);
     method public final boolean none();
     property public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] keys;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final Object?[] values;
     field @kotlin.PublishedApi internal Object?[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal Object?[] values;
@@ -2384,6 +2455,8 @@
     method public final String joinToString(optional CharSequence separator, optional CharSequence prefix, optional CharSequence postfix, optional int limit, optional CharSequence truncated, optional kotlin.jvm.functions.Function1<? super E,? extends java.lang.CharSequence>? transform);
     method public final boolean none();
     property @IntRange(from=0L) public final int capacity;
+    property @kotlin.PublishedApi internal final Object?[] elements;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property @IntRange(from=0L) public final int size;
     field @kotlin.PublishedApi internal Object?[] elements;
     field @kotlin.PublishedApi internal long[] metadata;
@@ -2454,8 +2527,11 @@
     method public void trimToSize(int maxSize);
     property public final int capacity;
     property public final int count;
+    property @kotlin.PublishedApi internal final Object?[] keys;
     property public final int maxSize;
+    property @kotlin.PublishedApi internal final long[] metadata;
     property public final int size;
+    property @kotlin.PublishedApi internal final Object?[] values;
     field @kotlin.PublishedApi internal Object?[] keys;
     field @kotlin.PublishedApi internal long[] metadata;
     field @kotlin.PublishedApi internal Object?[] values;
diff --git a/compose/animation/animation-core/api/current.txt b/compose/animation/animation-core/api/current.txt
index b19fbe0..cd47f48 100644
--- a/compose/animation/animation-core/api/current.txt
+++ b/compose/animation/animation-core/api/current.txt
@@ -70,6 +70,8 @@
   }
 
   public final class AnimationConstants {
+    property public static final int DefaultDurationMillis;
+    property public static final long UnspecifiedTime;
     field public static final int DefaultDurationMillis = 300; // 0x12c
     field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
     field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
@@ -585,6 +587,16 @@
   }
 
   public final class Spring {
+    property public static final float DampingRatioHighBouncy;
+    property public static final float DampingRatioLowBouncy;
+    property public static final float DampingRatioMediumBouncy;
+    property public static final float DampingRatioNoBouncy;
+    property public static final float DefaultDisplacementThreshold;
+    property public static final float StiffnessHigh;
+    property public static final float StiffnessLow;
+    property public static final float StiffnessMedium;
+    property public static final float StiffnessMediumLow;
+    property public static final float StiffnessVeryLow;
     field public static final float DampingRatioHighBouncy = 0.2f;
     field public static final float DampingRatioLowBouncy = 0.75f;
     field public static final float DampingRatioMediumBouncy = 0.5f;
diff --git a/compose/animation/animation-core/api/restricted_current.txt b/compose/animation/animation-core/api/restricted_current.txt
index 99d7a37..4d88661 100644
--- a/compose/animation/animation-core/api/restricted_current.txt
+++ b/compose/animation/animation-core/api/restricted_current.txt
@@ -70,6 +70,8 @@
   }
 
   public final class AnimationConstants {
+    property public static final int DefaultDurationMillis;
+    property public static final long UnspecifiedTime;
     field public static final int DefaultDurationMillis = 300; // 0x12c
     field public static final androidx.compose.animation.core.AnimationConstants INSTANCE;
     field public static final long UnspecifiedTime = -9223372036854775808L; // 0x8000000000000000L
@@ -585,6 +587,16 @@
   }
 
   public final class Spring {
+    property public static final float DampingRatioHighBouncy;
+    property public static final float DampingRatioLowBouncy;
+    property public static final float DampingRatioMediumBouncy;
+    property public static final float DampingRatioNoBouncy;
+    property public static final float DefaultDisplacementThreshold;
+    property public static final float StiffnessHigh;
+    property public static final float StiffnessLow;
+    property public static final float StiffnessMedium;
+    property public static final float StiffnessMediumLow;
+    property public static final float StiffnessVeryLow;
     field public static final float DampingRatioHighBouncy = 0.2f;
     field public static final float DampingRatioLowBouncy = 0.75f;
     field public static final float DampingRatioMediumBouncy = 0.5f;
diff --git a/compose/animation/animation/api/current.txt b/compose/animation/animation/api/current.txt
index 05c53bd..bc78c2f 100644
--- a/compose/animation/animation/api/current.txt
+++ b/compose/animation/animation/api/current.txt
@@ -26,6 +26,7 @@
     method public androidx.compose.animation.EnterTransition slideIntoContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffset);
     method public androidx.compose.animation.ExitTransition slideOutOfContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffset);
     method public infix androidx.compose.animation.ContentTransform using(androidx.compose.animation.ContentTransform, androidx.compose.animation.SizeTransform? sizeTransform);
+    property public androidx.compose.animation.ExitTransition KeepUntilTransitionsFinished;
     property public abstract androidx.compose.ui.Alignment contentAlignment;
   }
 
diff --git a/compose/animation/animation/api/restricted_current.txt b/compose/animation/animation/api/restricted_current.txt
index 05c53bd..bc78c2f 100644
--- a/compose/animation/animation/api/restricted_current.txt
+++ b/compose/animation/animation/api/restricted_current.txt
@@ -26,6 +26,7 @@
     method public androidx.compose.animation.EnterTransition slideIntoContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> initialOffset);
     method public androidx.compose.animation.ExitTransition slideOutOfContainer(int towards, optional androidx.compose.animation.core.FiniteAnimationSpec<androidx.compose.ui.unit.IntOffset> animationSpec, optional kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer> targetOffset);
     method public infix androidx.compose.animation.ContentTransform using(androidx.compose.animation.ContentTransform, androidx.compose.animation.SizeTransform? sizeTransform);
+    property public androidx.compose.animation.ExitTransition KeepUntilTransitionsFinished;
     property public abstract androidx.compose.ui.Alignment contentAlignment;
   }
 
diff --git a/compose/foundation/foundation/api/current.txt b/compose/foundation/foundation/api/current.txt
index 2432447..2a2f385 100644
--- a/compose/foundation/foundation/api/current.txt
+++ b/compose/foundation/foundation/api/current.txt
@@ -38,6 +38,7 @@
   @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class BasicTooltipDefaults {
     method public androidx.compose.foundation.MutatorMutex getGlobalMutatorMutex();
     property public final androidx.compose.foundation.MutatorMutex GlobalMutatorMutex;
+    property public static final long TooltipDuration;
     field public static final androidx.compose.foundation.BasicTooltipDefaults INSTANCE;
     field public static final long TooltipDuration = 1500L; // 0x5dcL
   }
@@ -103,6 +104,9 @@
   }
 
   @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class ComposeFoundationFlags {
+    property public final boolean DragGesturePickUpEnabled;
+    property public final boolean NewNestedFlingPropagationEnabled;
+    property public final boolean RemoveBasicTextGraphicsLayerEnabled;
     field public static boolean DragGesturePickUpEnabled;
     field public static final androidx.compose.foundation.ComposeFoundationFlags INSTANCE;
     field public static boolean NewNestedFlingPropagationEnabled;
@@ -1017,6 +1021,8 @@
   }
 
   public static final class LazyGridItemInfo.Companion {
+    property public static final int UnknownColumn;
+    property public static final int UnknownRow;
     field public static final int UnknownColumn = -1; // 0xffffffff
     field public static final int UnknownRow = -1; // 0xffffffff
   }
@@ -1418,6 +1424,7 @@
   public final class PagerDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.TargetedFlingBehavior flingBehavior(androidx.compose.foundation.pager.PagerState state, optional androidx.compose.foundation.pager.PagerSnapDistance pagerSnapDistance, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional @FloatRange(from=0.0, to=1.0) float snapPositionalThreshold);
     method @androidx.compose.runtime.Composable public androidx.compose.ui.input.nestedscroll.NestedScrollConnection pageNestedScrollConnection(androidx.compose.foundation.pager.PagerState state, androidx.compose.foundation.gestures.Orientation orientation);
+    property public static final int BeyondViewportPageCount;
     field public static final int BeyondViewportPageCount = 0; // 0x0
     field public static final androidx.compose.foundation.pager.PagerDefaults INSTANCE;
   }
@@ -1795,7 +1802,7 @@
     property public final int imeAction;
     property public final int keyboardType;
     property public final androidx.compose.ui.text.input.PlatformImeOptions? platformImeOptions;
-    property public boolean shouldShowKeyboardOnFocus;
+    property @Deprecated public boolean shouldShowKeyboardOnFocus;
     property public final Boolean? showKeyboardOnFocus;
     field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
   }
diff --git a/compose/foundation/foundation/api/restricted_current.txt b/compose/foundation/foundation/api/restricted_current.txt
index e4edebf..0bde428 100644
--- a/compose/foundation/foundation/api/restricted_current.txt
+++ b/compose/foundation/foundation/api/restricted_current.txt
@@ -38,6 +38,7 @@
   @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class BasicTooltipDefaults {
     method public androidx.compose.foundation.MutatorMutex getGlobalMutatorMutex();
     property public final androidx.compose.foundation.MutatorMutex GlobalMutatorMutex;
+    property public static final long TooltipDuration;
     field public static final androidx.compose.foundation.BasicTooltipDefaults INSTANCE;
     field public static final long TooltipDuration = 1500L; // 0x5dcL
   }
@@ -103,6 +104,9 @@
   }
 
   @SuppressCompatibility @androidx.compose.foundation.ExperimentalFoundationApi public final class ComposeFoundationFlags {
+    property public final boolean DragGesturePickUpEnabled;
+    property public final boolean NewNestedFlingPropagationEnabled;
+    property public final boolean RemoveBasicTextGraphicsLayerEnabled;
     field public static boolean DragGesturePickUpEnabled;
     field public static final androidx.compose.foundation.ComposeFoundationFlags INSTANCE;
     field public static boolean NewNestedFlingPropagationEnabled;
@@ -1019,6 +1023,8 @@
   }
 
   public static final class LazyGridItemInfo.Companion {
+    property public static final int UnknownColumn;
+    property public static final int UnknownRow;
     field public static final int UnknownColumn = -1; // 0xffffffff
     field public static final int UnknownRow = -1; // 0xffffffff
   }
@@ -1420,6 +1426,7 @@
   public final class PagerDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.TargetedFlingBehavior flingBehavior(androidx.compose.foundation.pager.PagerState state, optional androidx.compose.foundation.pager.PagerSnapDistance pagerSnapDistance, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional @FloatRange(from=0.0, to=1.0) float snapPositionalThreshold);
     method @androidx.compose.runtime.Composable public androidx.compose.ui.input.nestedscroll.NestedScrollConnection pageNestedScrollConnection(androidx.compose.foundation.pager.PagerState state, androidx.compose.foundation.gestures.Orientation orientation);
+    property public static final int BeyondViewportPageCount;
     field public static final int BeyondViewportPageCount = 0; // 0x0
     field public static final androidx.compose.foundation.pager.PagerDefaults INSTANCE;
   }
@@ -1797,7 +1804,7 @@
     property public final int imeAction;
     property public final int keyboardType;
     property public final androidx.compose.ui.text.input.PlatformImeOptions? platformImeOptions;
-    property public boolean shouldShowKeyboardOnFocus;
+    property @Deprecated public boolean shouldShowKeyboardOnFocus;
     property public final Boolean? showKeyboardOnFocus;
     field public static final androidx.compose.foundation.text.KeyboardOptions.Companion Companion;
   }
diff --git a/compose/material/material/api/current.txt b/compose/material/material/api/current.txt
index d3868ad..ae1aabc 100644
--- a/compose/material/material/api/current.txt
+++ b/compose/material/material/api/current.txt
@@ -215,6 +215,7 @@
     property public final float IconSpacing;
     property public final float MinHeight;
     property public final float MinWidth;
+    property public static final float OutlinedBorderOpacity;
     property public final float OutlinedBorderSize;
     property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
     property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
@@ -269,8 +270,11 @@
     method public float getSelectedIconSize();
     method @androidx.compose.runtime.Composable public androidx.compose.material.ChipColors outlinedChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconContentColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconContentColor);
     method @androidx.compose.runtime.Composable public androidx.compose.material.SelectableChipColors outlinedFilterChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconColor, optional long selectedBackgroundColor, optional long selectedContentColor, optional long selectedLeadingIconColor);
+    property public static final float ContentOpacity;
+    property public static final float LeadingIconOpacity;
     property public final float LeadingIconSize;
     property public final float MinHeight;
+    property public static final float OutlinedBorderOpacity;
     property public final float OutlinedBorderSize;
     property public final float SelectedIconSize;
     property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
@@ -381,6 +385,7 @@
     method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getShape();
     property public final androidx.compose.animation.core.TweenSpec<java.lang.Float> AnimationSpec;
     property public final float Elevation;
+    property public static final float ScrimOpacity;
     property @androidx.compose.runtime.Composable public final long backgroundColor;
     property @androidx.compose.runtime.Composable public final long scrimColor;
     property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape shape;
@@ -605,6 +610,7 @@
   public final class ProgressIndicatorDefaults {
     method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
     method public float getStrokeWidth();
+    property public static final float IndicatorBackgroundOpacity;
     property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
     property public final float StrokeWidth;
     field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
@@ -719,6 +725,11 @@
 
   public final class SliderDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+    property public static final float DisabledActiveTrackAlpha;
+    property public static final float DisabledInactiveTrackAlpha;
+    property public static final float DisabledTickAlpha;
+    property public static final float InactiveTrackAlpha;
+    property public static final float TickAlpha;
     field public static final float DisabledActiveTrackAlpha = 0.32f;
     field public static final float DisabledInactiveTrackAlpha = 0.12f;
     field public static final float DisabledTickAlpha = 0.12f;
@@ -805,6 +816,8 @@
     method @Deprecated public float getVelocityThreshold();
     method @Deprecated public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
     property @Deprecated public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property @Deprecated public static final float StandardResistanceFactor;
+    property @Deprecated public static final float StiffResistanceFactor;
     property @Deprecated public final float VelocityThreshold;
     field @Deprecated public static final androidx.compose.material.SwipeableDefaults INSTANCE;
     field @Deprecated public static final float StandardResistanceFactor = 10.0f;
@@ -879,6 +892,7 @@
     method public float getIndicatorHeight();
     method public float getScrollableTabRowPadding();
     method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+    property public static final float DividerOpacity;
     property public final float DividerThickness;
     property public final float IndicatorHeight;
     property public final float ScrollableTabRowPadding;
@@ -925,12 +939,15 @@
     method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
     method @SuppressCompatibility @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithLabelPadding(optional float start, optional float end, optional float top, optional float bottom);
     method @SuppressCompatibility @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithoutLabelPadding(optional float start, optional float top, optional float end, optional float bottom);
+    property public static final float BackgroundOpacity;
     property public final float FocusedBorderThickness;
+    property public static final float IconOpacity;
     property public final float MinHeight;
     property public final float MinWidth;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape OutlinedTextFieldShape;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape TextFieldShape;
     property public final float UnfocusedBorderThickness;
+    property public static final float UnfocusedIndicatorLineOpacity;
     field public static final float BackgroundOpacity = 0.12f;
     field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
     field public static final float IconOpacity = 0.54f;
diff --git a/compose/material/material/api/restricted_current.txt b/compose/material/material/api/restricted_current.txt
index d3868ad..ae1aabc 100644
--- a/compose/material/material/api/restricted_current.txt
+++ b/compose/material/material/api/restricted_current.txt
@@ -215,6 +215,7 @@
     property public final float IconSpacing;
     property public final float MinHeight;
     property public final float MinWidth;
+    property public static final float OutlinedBorderOpacity;
     property public final float OutlinedBorderSize;
     property public final androidx.compose.foundation.layout.PaddingValues TextButtonContentPadding;
     property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
@@ -269,8 +270,11 @@
     method public float getSelectedIconSize();
     method @androidx.compose.runtime.Composable public androidx.compose.material.ChipColors outlinedChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconContentColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconContentColor);
     method @androidx.compose.runtime.Composable public androidx.compose.material.SelectableChipColors outlinedFilterChipColors(optional long backgroundColor, optional long contentColor, optional long leadingIconColor, optional long disabledBackgroundColor, optional long disabledContentColor, optional long disabledLeadingIconColor, optional long selectedBackgroundColor, optional long selectedContentColor, optional long selectedLeadingIconColor);
+    property public static final float ContentOpacity;
+    property public static final float LeadingIconOpacity;
     property public final float LeadingIconSize;
     property public final float MinHeight;
+    property public static final float OutlinedBorderOpacity;
     property public final float OutlinedBorderSize;
     property public final float SelectedIconSize;
     property @androidx.compose.runtime.Composable public final androidx.compose.foundation.BorderStroke outlinedBorder;
@@ -381,6 +385,7 @@
     method @androidx.compose.runtime.Composable public androidx.compose.ui.graphics.Shape getShape();
     property public final androidx.compose.animation.core.TweenSpec<java.lang.Float> AnimationSpec;
     property public final float Elevation;
+    property public static final float ScrimOpacity;
     property @androidx.compose.runtime.Composable public final long backgroundColor;
     property @androidx.compose.runtime.Composable public final long scrimColor;
     property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape shape;
@@ -605,6 +610,7 @@
   public final class ProgressIndicatorDefaults {
     method public androidx.compose.animation.core.SpringSpec<java.lang.Float> getProgressAnimationSpec();
     method public float getStrokeWidth();
+    property public static final float IndicatorBackgroundOpacity;
     property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> ProgressAnimationSpec;
     property public final float StrokeWidth;
     field public static final androidx.compose.material.ProgressIndicatorDefaults INSTANCE;
@@ -719,6 +725,11 @@
 
   public final class SliderDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.material.SliderColors colors(optional long thumbColor, optional long disabledThumbColor, optional long activeTrackColor, optional long inactiveTrackColor, optional long disabledActiveTrackColor, optional long disabledInactiveTrackColor, optional long activeTickColor, optional long inactiveTickColor, optional long disabledActiveTickColor, optional long disabledInactiveTickColor);
+    property public static final float DisabledActiveTrackAlpha;
+    property public static final float DisabledInactiveTrackAlpha;
+    property public static final float DisabledTickAlpha;
+    property public static final float InactiveTrackAlpha;
+    property public static final float TickAlpha;
     field public static final float DisabledActiveTrackAlpha = 0.32f;
     field public static final float DisabledInactiveTrackAlpha = 0.12f;
     field public static final float DisabledTickAlpha = 0.12f;
@@ -805,6 +816,8 @@
     method @Deprecated public float getVelocityThreshold();
     method @Deprecated public androidx.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
     property @Deprecated public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property @Deprecated public static final float StandardResistanceFactor;
+    property @Deprecated public static final float StiffResistanceFactor;
     property @Deprecated public final float VelocityThreshold;
     field @Deprecated public static final androidx.compose.material.SwipeableDefaults INSTANCE;
     field @Deprecated public static final float StandardResistanceFactor = 10.0f;
@@ -879,6 +892,7 @@
     method public float getIndicatorHeight();
     method public float getScrollableTabRowPadding();
     method public androidx.compose.ui.Modifier tabIndicatorOffset(androidx.compose.ui.Modifier, androidx.compose.material.TabPosition currentTabPosition);
+    property public static final float DividerOpacity;
     property public final float DividerThickness;
     property public final float IndicatorHeight;
     property public final float ScrollableTabRowPadding;
@@ -925,12 +939,15 @@
     method @androidx.compose.runtime.Composable public androidx.compose.material.TextFieldColors textFieldColors(optional long textColor, optional long disabledTextColor, optional long backgroundColor, optional long cursorColor, optional long errorCursorColor, optional long focusedIndicatorColor, optional long unfocusedIndicatorColor, optional long disabledIndicatorColor, optional long errorIndicatorColor, optional long leadingIconColor, optional long disabledLeadingIconColor, optional long errorLeadingIconColor, optional long trailingIconColor, optional long disabledTrailingIconColor, optional long errorTrailingIconColor, optional long focusedLabelColor, optional long unfocusedLabelColor, optional long disabledLabelColor, optional long errorLabelColor, optional long placeholderColor, optional long disabledPlaceholderColor);
     method @SuppressCompatibility @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithLabelPadding(optional float start, optional float end, optional float top, optional float bottom);
     method @SuppressCompatibility @androidx.compose.material.ExperimentalMaterialApi public androidx.compose.foundation.layout.PaddingValues textFieldWithoutLabelPadding(optional float start, optional float top, optional float end, optional float bottom);
+    property public static final float BackgroundOpacity;
     property public final float FocusedBorderThickness;
+    property public static final float IconOpacity;
     property public final float MinHeight;
     property public final float MinWidth;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape OutlinedTextFieldShape;
     property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final androidx.compose.ui.graphics.Shape TextFieldShape;
     property public final float UnfocusedBorderThickness;
+    property public static final float UnfocusedIndicatorLineOpacity;
     field public static final float BackgroundOpacity = 0.12f;
     field public static final androidx.compose.material.TextFieldDefaults INSTANCE;
     field public static final float IconOpacity = 0.54f;
diff --git a/compose/material3/adaptive/adaptive-layout/api/current.txt b/compose/material3/adaptive/adaptive-layout/api/current.txt
index d909d3e..420928f 100644
--- a/compose/material3/adaptive/adaptive-layout/api/current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/current.txt
@@ -120,6 +120,7 @@
   }
 
   public static final class PaneExpansionState.Companion {
+    property public static final int Unspecified;
   }
 
   @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Immutable public sealed interface PaneExpansionStateKey {
@@ -149,6 +150,8 @@
     method public androidx.compose.animation.EnterTransition getEnterTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionScope);
     method public androidx.compose.animation.ExitTransition getExitTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionScope);
     method public int getType();
+    property public androidx.compose.animation.EnterTransition enterTransition;
+    property public androidx.compose.animation.ExitTransition exitTransition;
     property public abstract int type;
     field public static final androidx.compose.material3.adaptive.layout.PaneMotion.Companion Companion;
   }
diff --git a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
index d909d3e..420928f 100644
--- a/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
+++ b/compose/material3/adaptive/adaptive-layout/api/restricted_current.txt
@@ -120,6 +120,7 @@
   }
 
   public static final class PaneExpansionState.Companion {
+    property public static final int Unspecified;
   }
 
   @SuppressCompatibility @androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi @androidx.compose.runtime.Immutable public sealed interface PaneExpansionStateKey {
@@ -149,6 +150,8 @@
     method public androidx.compose.animation.EnterTransition getEnterTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionScope);
     method public androidx.compose.animation.ExitTransition getExitTransition(androidx.compose.material3.adaptive.layout.PaneScaffoldMotionScope);
     method public int getType();
+    property public androidx.compose.animation.EnterTransition enterTransition;
+    property public androidx.compose.animation.ExitTransition exitTransition;
     property public abstract int type;
     field public static final androidx.compose.material3.adaptive.layout.PaneMotion.Companion Companion;
   }
diff --git a/compose/material3/material3/api/current.txt b/compose/material3/material3/api/current.txt
index c4d9b8d..8737a02 100644
--- a/compose/material3/material3/api/current.txt
+++ b/compose/material3/material3/api/current.txt
@@ -617,6 +617,9 @@
     method public kotlin.ranges.IntRange getYearRange();
     property public final androidx.compose.material3.SelectableDates AllDates;
     property public final float TonalElevation;
+    property public static final String YearAbbrMonthDaySkeleton;
+    property public static final String YearMonthSkeleton;
+    property public static final String YearMonthWeekdayDaySkeleton;
     property public final kotlin.ranges.IntRange YearRange;
     property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape shape;
     field public static final androidx.compose.material3.DatePickerDefaults INSTANCE;
diff --git a/compose/material3/material3/api/restricted_current.txt b/compose/material3/material3/api/restricted_current.txt
index c4d9b8d..8737a02 100644
--- a/compose/material3/material3/api/restricted_current.txt
+++ b/compose/material3/material3/api/restricted_current.txt
@@ -617,6 +617,9 @@
     method public kotlin.ranges.IntRange getYearRange();
     property public final androidx.compose.material3.SelectableDates AllDates;
     property public final float TonalElevation;
+    property public static final String YearAbbrMonthDaySkeleton;
+    property public static final String YearMonthSkeleton;
+    property public static final String YearMonthWeekdayDaySkeleton;
     property public final kotlin.ranges.IntRange YearRange;
     property @androidx.compose.runtime.Composable public final androidx.compose.ui.graphics.Shape shape;
     field public static final androidx.compose.material3.DatePickerDefaults INSTANCE;
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index 0d5f5e1..d43eda3 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -233,6 +233,7 @@
 
   public interface CompositionLocalAccessorScope {
     method public <T> T getCurrentValue(androidx.compose.runtime.CompositionLocal<T>);
+    property public T currentValue;
   }
 
   @androidx.compose.runtime.Stable public final class CompositionLocalContext {
@@ -800,6 +801,9 @@
 
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface FunctionKeyMeta.Container {
     method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
+    property public abstract int endOffset;
+    property public abstract int key;
+    property public abstract int startOffset;
   }
 
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMetaClass {
@@ -912,6 +916,7 @@
     method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
     method public inline <R> R withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
     method public inline <T> T withoutReadObservation(kotlin.jvm.functions.Function0<? extends T> block);
+    property public static final int PreexistingSnapshotId;
     property public final androidx.compose.runtime.snapshots.Snapshot current;
     property public final boolean isApplyObserverNotificationPending;
     property public final boolean isInSnapshot;
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index d3ca749..616f4fe 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -264,6 +264,7 @@
 
   public interface CompositionLocalAccessorScope {
     method public <T> T getCurrentValue(androidx.compose.runtime.CompositionLocal<T>);
+    property public T currentValue;
   }
 
   @androidx.compose.runtime.Stable public final class CompositionLocalContext {
@@ -854,6 +855,9 @@
 
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public static @interface FunctionKeyMeta.Container {
     method public abstract androidx.compose.runtime.internal.FunctionKeyMeta[] value();
+    property public abstract int endOffset;
+    property public abstract int key;
+    property public abstract int startOffset;
   }
 
   @androidx.compose.runtime.ComposeCompilerApi @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets=kotlin.annotation.AnnotationTarget.CLASS) public @interface FunctionKeyMetaClass {
@@ -974,6 +978,7 @@
     method public androidx.compose.runtime.snapshots.Snapshot takeSnapshot(optional kotlin.jvm.functions.Function1<java.lang.Object,kotlin.Unit>? readObserver);
     method public inline <R> R withMutableSnapshot(kotlin.jvm.functions.Function0<? extends R> block);
     method public inline <T> T withoutReadObservation(kotlin.jvm.functions.Function0<? extends T> block);
+    property public static final int PreexistingSnapshotId;
     property public final androidx.compose.runtime.snapshots.Snapshot current;
     property @kotlin.PublishedApi internal final androidx.compose.runtime.snapshots.Snapshot? currentThreadSnapshot;
     property public final boolean isApplyObserverNotificationPending;
diff --git a/compose/ui/ui-graphics/api/current.txt b/compose/ui/ui-graphics/api/current.txt
index 578cc326..ddbe8ae 100644
--- a/compose/ui/ui-graphics/api/current.txt
+++ b/compose/ui/ui-graphics/api/current.txt
@@ -545,6 +545,17 @@
   }
 
   public static final class Matrix.Companion {
+    property public static final int Perspective0;
+    property public static final int Perspective1;
+    property public static final int Perspective2;
+    property public static final int ScaleX;
+    property public static final int ScaleY;
+    property public static final int ScaleZ;
+    property public static final int SkewX;
+    property public static final int SkewY;
+    property public static final int TranslateX;
+    property public static final int TranslateY;
+    property public static final int TranslateZ;
   }
 
   public final class MatrixKt {
@@ -636,6 +647,7 @@
   }
 
   public final class PaintKt {
+    property public static final float DefaultAlpha;
     field public static final float DefaultAlpha = 1.0f;
   }
 
@@ -1410,6 +1422,8 @@
     method public int getDefaultJoin();
     property public final int DefaultCap;
     property public final int DefaultJoin;
+    property public static final float DefaultMiter;
+    property public static final float HairlineWidth;
   }
 
 }
@@ -1511,6 +1525,7 @@
   public final class GraphicsLayerKt {
     method public static void drawLayer(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.layer.GraphicsLayer graphicsLayer);
     method public static void setOutline(androidx.compose.ui.graphics.layer.GraphicsLayer, androidx.compose.ui.graphics.Outline outline);
+    property public static final float DefaultCameraDistance;
     field public static final float DefaultCameraDistance = 8.0f;
   }
 
diff --git a/compose/ui/ui-graphics/api/restricted_current.txt b/compose/ui/ui-graphics/api/restricted_current.txt
index 231e5a5..45c8af0 100644
--- a/compose/ui/ui-graphics/api/restricted_current.txt
+++ b/compose/ui/ui-graphics/api/restricted_current.txt
@@ -620,6 +620,17 @@
   }
 
   public static final class Matrix.Companion {
+    property public static final int Perspective0;
+    property public static final int Perspective1;
+    property public static final int Perspective2;
+    property public static final int ScaleX;
+    property public static final int ScaleY;
+    property public static final int ScaleZ;
+    property public static final int SkewX;
+    property public static final int SkewY;
+    property public static final int TranslateX;
+    property public static final int TranslateY;
+    property public static final int TranslateZ;
   }
 
   public final class MatrixKt {
@@ -711,6 +722,7 @@
   }
 
   public final class PaintKt {
+    property public static final float DefaultAlpha;
     field public static final float DefaultAlpha = 1.0f;
   }
 
@@ -1511,6 +1523,8 @@
     method public int getDefaultJoin();
     property public final int DefaultCap;
     property public final int DefaultJoin;
+    property public static final float DefaultMiter;
+    property public static final float HairlineWidth;
   }
 
 }
@@ -1612,6 +1626,7 @@
   public final class GraphicsLayerKt {
     method public static void drawLayer(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.graphics.layer.GraphicsLayer graphicsLayer);
     method public static void setOutline(androidx.compose.ui.graphics.layer.GraphicsLayer, androidx.compose.ui.graphics.Outline outline);
+    property public static final float DefaultCameraDistance;
     field public static final float DefaultCameraDistance = 8.0f;
   }
 
diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index 148bf85..8ef922a 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -842,6 +842,7 @@
   }
 
   public static final class Font.Companion {
+    property public static final long MaximumAsyncTimeoutMillis;
     field public static final long MaximumAsyncTimeoutMillis = 15000L; // 0x3a98L
   }
 
diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index 6ddcf52..3f58b53 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -842,6 +842,7 @@
   }
 
   public static final class Font.Companion {
+    property public static final long MaximumAsyncTimeoutMillis;
     field public static final long MaximumAsyncTimeoutMillis = 15000L; // 0x3a98L
   }
 
diff --git a/compose/ui/ui-tooling-preview/api/current.txt b/compose/ui/ui-tooling-preview/api/current.txt
index 4f8ca68..b431232 100644
--- a/compose/ui/ui-tooling-preview/api/current.txt
+++ b/compose/ui/ui-tooling-preview/api/current.txt
@@ -6,6 +6,43 @@
     method @Deprecated public String getWEAR_OS_RECT();
     method @Deprecated public String getWEAR_OS_SMALL_ROUND();
     method @Deprecated public String getWEAR_OS_SQUARE();
+    property public static final String AUTOMOTIVE_1024p;
+    property public static final String DEFAULT;
+    property public static final String DESKTOP;
+    property public static final String FOLDABLE;
+    property public static final String NEXUS_10;
+    property public static final String NEXUS_5;
+    property public static final String NEXUS_5X;
+    property public static final String NEXUS_6;
+    property public static final String NEXUS_6P;
+    property public static final String NEXUS_7;
+    property public static final String NEXUS_7_2013;
+    property public static final String NEXUS_9;
+    property public static final String PHONE;
+    property public static final String PIXEL;
+    property public static final String PIXEL_2;
+    property public static final String PIXEL_2_XL;
+    property public static final String PIXEL_3;
+    property public static final String PIXEL_3A;
+    property public static final String PIXEL_3A_XL;
+    property public static final String PIXEL_3_XL;
+    property public static final String PIXEL_4;
+    property public static final String PIXEL_4A;
+    property public static final String PIXEL_4_XL;
+    property public static final String PIXEL_5;
+    property public static final String PIXEL_6;
+    property public static final String PIXEL_6A;
+    property public static final String PIXEL_6_PRO;
+    property public static final String PIXEL_7;
+    property public static final String PIXEL_7A;
+    property public static final String PIXEL_7_PRO;
+    property public static final String PIXEL_C;
+    property public static final String PIXEL_FOLD;
+    property public static final String PIXEL_TABLET;
+    property public static final String PIXEL_XL;
+    property public static final String TABLET;
+    property public static final String TV_1080p;
+    property public static final String TV_720p;
     property @Deprecated public String WEAR_OS_LARGE_ROUND;
     property @Deprecated public String WEAR_OS_RECT;
     property @Deprecated public String WEAR_OS_SMALL_ROUND;
@@ -85,6 +122,19 @@
 
   @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.compose.ui.tooling.preview.Preview[] value();
+    property @IntRange(from=1L) public abstract int apiLevel;
+    property public abstract long backgroundColor;
+    property public abstract String device;
+    property @FloatRange(from=0.01) public abstract float fontScale;
+    property public abstract String group;
+    property public abstract int heightDp;
+    property public abstract String locale;
+    property public abstract String name;
+    property public abstract boolean showBackground;
+    property public abstract boolean showSystemUi;
+    property public abstract int uiMode;
+    property public abstract int wallpaper;
+    property public abstract int widthDp;
   }
 
   @androidx.compose.ui.tooling.preview.Preview(name="Red", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.RED_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Blue", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.BLUE_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Green", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.GREEN_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Yellow", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.YELLOW_DOMINATED_EXAMPLE) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface PreviewDynamicColors {
@@ -114,6 +164,11 @@
   }
 
   public final class Wallpapers {
+    property public static final int BLUE_DOMINATED_EXAMPLE;
+    property public static final int GREEN_DOMINATED_EXAMPLE;
+    property public static final int NONE;
+    property public static final int RED_DOMINATED_EXAMPLE;
+    property public static final int YELLOW_DOMINATED_EXAMPLE;
     field public static final int BLUE_DOMINATED_EXAMPLE = 2; // 0x2
     field public static final int GREEN_DOMINATED_EXAMPLE = 1; // 0x1
     field public static final androidx.compose.ui.tooling.preview.Wallpapers INSTANCE;
diff --git a/compose/ui/ui-tooling-preview/api/restricted_current.txt b/compose/ui/ui-tooling-preview/api/restricted_current.txt
index 4f8ca68..b431232 100644
--- a/compose/ui/ui-tooling-preview/api/restricted_current.txt
+++ b/compose/ui/ui-tooling-preview/api/restricted_current.txt
@@ -6,6 +6,43 @@
     method @Deprecated public String getWEAR_OS_RECT();
     method @Deprecated public String getWEAR_OS_SMALL_ROUND();
     method @Deprecated public String getWEAR_OS_SQUARE();
+    property public static final String AUTOMOTIVE_1024p;
+    property public static final String DEFAULT;
+    property public static final String DESKTOP;
+    property public static final String FOLDABLE;
+    property public static final String NEXUS_10;
+    property public static final String NEXUS_5;
+    property public static final String NEXUS_5X;
+    property public static final String NEXUS_6;
+    property public static final String NEXUS_6P;
+    property public static final String NEXUS_7;
+    property public static final String NEXUS_7_2013;
+    property public static final String NEXUS_9;
+    property public static final String PHONE;
+    property public static final String PIXEL;
+    property public static final String PIXEL_2;
+    property public static final String PIXEL_2_XL;
+    property public static final String PIXEL_3;
+    property public static final String PIXEL_3A;
+    property public static final String PIXEL_3A_XL;
+    property public static final String PIXEL_3_XL;
+    property public static final String PIXEL_4;
+    property public static final String PIXEL_4A;
+    property public static final String PIXEL_4_XL;
+    property public static final String PIXEL_5;
+    property public static final String PIXEL_6;
+    property public static final String PIXEL_6A;
+    property public static final String PIXEL_6_PRO;
+    property public static final String PIXEL_7;
+    property public static final String PIXEL_7A;
+    property public static final String PIXEL_7_PRO;
+    property public static final String PIXEL_C;
+    property public static final String PIXEL_FOLD;
+    property public static final String PIXEL_TABLET;
+    property public static final String PIXEL_XL;
+    property public static final String TABLET;
+    property public static final String TV_1080p;
+    property public static final String TV_720p;
     property @Deprecated public String WEAR_OS_LARGE_ROUND;
     property @Deprecated public String WEAR_OS_RECT;
     property @Deprecated public String WEAR_OS_SMALL_ROUND;
@@ -85,6 +122,19 @@
 
   @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.compose.ui.tooling.preview.Preview[] value();
+    property @IntRange(from=1L) public abstract int apiLevel;
+    property public abstract long backgroundColor;
+    property public abstract String device;
+    property @FloatRange(from=0.01) public abstract float fontScale;
+    property public abstract String group;
+    property public abstract int heightDp;
+    property public abstract String locale;
+    property public abstract String name;
+    property public abstract boolean showBackground;
+    property public abstract boolean showSystemUi;
+    property public abstract int uiMode;
+    property public abstract int wallpaper;
+    property public abstract int widthDp;
   }
 
   @androidx.compose.ui.tooling.preview.Preview(name="Red", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.RED_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Blue", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.BLUE_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Green", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.GREEN_DOMINATED_EXAMPLE) @androidx.compose.ui.tooling.preview.Preview(name="Yellow", wallpaper=androidx.compose.ui.tooling.preview.Wallpapers.YELLOW_DOMINATED_EXAMPLE) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface PreviewDynamicColors {
@@ -114,6 +164,11 @@
   }
 
   public final class Wallpapers {
+    property public static final int BLUE_DOMINATED_EXAMPLE;
+    property public static final int GREEN_DOMINATED_EXAMPLE;
+    property public static final int NONE;
+    property public static final int RED_DOMINATED_EXAMPLE;
+    property public static final int YELLOW_DOMINATED_EXAMPLE;
     field public static final int BLUE_DOMINATED_EXAMPLE = 2; // 0x2
     field public static final int GREEN_DOMINATED_EXAMPLE = 1; // 0x1
     field public static final androidx.compose.ui.tooling.preview.Wallpapers INSTANCE;
diff --git a/compose/ui/ui-unit/api/current.txt b/compose/ui/ui-unit/api/current.txt
index ea55cc7..ccac8ab 100644
--- a/compose/ui/ui-unit/api/current.txt
+++ b/compose/ui/ui-unit/api/current.txt
@@ -38,6 +38,7 @@
     method @androidx.compose.runtime.Stable public long fixedHeight(int height);
     method @androidx.compose.runtime.Stable public long fixedWidth(int width);
     method @Deprecated @androidx.compose.runtime.Stable public long restrictConstraints(int minWidth, int maxWidth, int minHeight, int maxHeight, optional boolean prioritizeWidth);
+    property public static final int Infinity;
   }
 
   public final class ConstraintsKt {
diff --git a/compose/ui/ui-unit/api/restricted_current.txt b/compose/ui/ui-unit/api/restricted_current.txt
index e987014..a23a197 100644
--- a/compose/ui/ui-unit/api/restricted_current.txt
+++ b/compose/ui/ui-unit/api/restricted_current.txt
@@ -39,6 +39,7 @@
     method @androidx.compose.runtime.Stable public long fixedHeight(int height);
     method @androidx.compose.runtime.Stable public long fixedWidth(int width);
     method @Deprecated @androidx.compose.runtime.Stable public long restrictConstraints(int minWidth, int maxWidth, int minHeight, int maxHeight, optional boolean prioritizeWidth);
+    property public static final int Infinity;
   }
 
   public final class ConstraintsKt {
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index c6015a2..80dcf60 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -132,6 +132,9 @@
   }
 
   @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public final class ComposeUiFlags {
+    property public final boolean NewNestedScrollFlingDispatchingEnabled;
+    property public final boolean isRectTrackingEnabled;
+    property public final boolean isSemanticAutofillEnabled;
     field public static final androidx.compose.ui.ComposeUiFlags INSTANCE;
     field public static boolean NewNestedScrollFlingDispatchingEnabled;
     field public static boolean isRectTrackingEnabled;
@@ -880,6 +883,7 @@
     method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
     method public static long getDefaultShadowColor();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.layer.GraphicsLayer rememberGraphicsLayer();
+    property public static final float DefaultCameraDistance;
     property public static final long DefaultShadowColor;
     field public static final float DefaultCameraDistance = 8.0f;
   }
@@ -1008,10 +1012,24 @@
     method public static long getDefaultTintColor();
     method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
     property public static final int DefaultFillType;
+    property public static final String DefaultGroupName;
+    property public static final String DefaultPathName;
+    property public static final float DefaultPivotX;
+    property public static final float DefaultPivotY;
+    property public static final float DefaultRotation;
+    property public static final float DefaultScaleX;
+    property public static final float DefaultScaleY;
     property public static final int DefaultStrokeLineCap;
     property public static final int DefaultStrokeLineJoin;
+    property public static final float DefaultStrokeLineMiter;
+    property public static final float DefaultStrokeLineWidth;
     property public static final int DefaultTintBlendMode;
     property public static final long DefaultTintColor;
+    property public static final float DefaultTranslationX;
+    property public static final float DefaultTranslationY;
+    property public static final float DefaultTrimPathEnd;
+    property public static final float DefaultTrimPathOffset;
+    property public static final float DefaultTrimPathStart;
     property public static final java.util.List<androidx.compose.ui.graphics.vector.PathNode> EmptyPath;
     field public static final String DefaultGroupName = "";
     field public static final String DefaultPathName = "";
@@ -1043,6 +1061,7 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+    property public static final String RootGroupName;
     field public static final String RootGroupName = "VectorRootGroup";
   }
 
@@ -2250,6 +2269,7 @@
   }
 
   public static final class AlignmentLine.Companion {
+    property public static final int Unspecified;
   }
 
   public final class AlignmentLineKt {
@@ -2471,6 +2491,7 @@
     method public androidx.compose.ui.layout.LayoutCoordinates getLookaheadScopeCoordinates(androidx.compose.ui.layout.Placeable.PlacementScope);
     method public default long localLookaheadPositionOf(androidx.compose.ui.layout.LayoutCoordinates, androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional long relativeToSource, optional boolean includeMotionFrameOfReference);
     method public androidx.compose.ui.layout.LayoutCoordinates toLookaheadCoordinates(androidx.compose.ui.layout.LayoutCoordinates);
+    property public androidx.compose.ui.layout.LayoutCoordinates lookaheadScopeCoordinates;
   }
 
   public final class LookaheadScopeKt {
@@ -2764,6 +2785,7 @@
     method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
     method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
     method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
+    property public T current;
     property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;
   }
 
@@ -2790,6 +2812,7 @@
 
   public interface ModifierLocalReadScope {
     method public <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+    property public T current;
   }
 
   @androidx.compose.runtime.Stable public final class ProvidableModifierLocal<T> extends androidx.compose.ui.modifier.ModifierLocal<T> {
@@ -3879,11 +3902,38 @@
     method public static void setTraversalIndex(androidx.compose.ui.semantics.SemanticsPropertyReceiver, float);
     method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
     method public static void showTextSubstitution(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Boolean,java.lang.Boolean>? action);
+    property public final androidx.compose.ui.semantics.CollectionInfo collectionInfo;
+    property public final androidx.compose.ui.semantics.CollectionItemInfo collectionItemInfo;
+    property public final int contentDataType;
+    property public final androidx.compose.ui.autofill.ContentType contentType;
+    property public final java.util.List<? extends androidx.compose.ui.semantics.CustomAccessibilityAction> customActions;
+    property public final androidx.compose.ui.text.AnnotatedString editableText;
+    property public final boolean focused;
+    property public final androidx.compose.ui.semantics.ScrollAxisRange horizontalScrollAxisRange;
+    property @Deprecated public final int imeAction;
+    property @Deprecated public final boolean isContainer;
+    property public final boolean isEditable;
+    property public final boolean isShowingTextSubstitution;
+    property public final boolean isTraversalGroup;
+    property public final int liveRegion;
+    property public final int maxTextLength;
+    property public final String paneTitle;
+    property public final androidx.compose.ui.semantics.ProgressBarRangeInfo progressBarRangeInfo;
+    property public final int role;
+    property public final boolean selected;
+    property public final String stateDescription;
+    property public final String testTag;
+    property public final long textSelectionRange;
+    property public final androidx.compose.ui.text.AnnotatedString textSubstitution;
+    property public final androidx.compose.ui.state.ToggleableState toggleableState;
+    property public final float traversalIndex;
+    property public final androidx.compose.ui.semantics.ScrollAxisRange verticalScrollAxisRange;
   }
 
   public final class SemanticsProperties_androidKt {
     method public static boolean getTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static void setTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+    property public final boolean testTagsAsResourceId;
   }
 
   public final class SemanticsPropertyKey<T> {
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index 6dbb80a..e79fe0f 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -132,6 +132,9 @@
   }
 
   @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public final class ComposeUiFlags {
+    property public final boolean NewNestedScrollFlingDispatchingEnabled;
+    property public final boolean isRectTrackingEnabled;
+    property public final boolean isSemanticAutofillEnabled;
     field public static final androidx.compose.ui.ComposeUiFlags INSTANCE;
     field public static boolean NewNestedScrollFlingDispatchingEnabled;
     field public static boolean isRectTrackingEnabled;
@@ -880,6 +883,7 @@
     method public static androidx.compose.ui.graphics.GraphicsLayerScope GraphicsLayerScope();
     method public static long getDefaultShadowColor();
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.layer.GraphicsLayer rememberGraphicsLayer();
+    property public static final float DefaultCameraDistance;
     property public static final long DefaultShadowColor;
     field public static final float DefaultCameraDistance = 8.0f;
   }
@@ -1009,10 +1013,24 @@
     method public static long getDefaultTintColor();
     method public static java.util.List<androidx.compose.ui.graphics.vector.PathNode> getEmptyPath();
     property public static final int DefaultFillType;
+    property public static final String DefaultGroupName;
+    property public static final String DefaultPathName;
+    property public static final float DefaultPivotX;
+    property public static final float DefaultPivotY;
+    property public static final float DefaultRotation;
+    property public static final float DefaultScaleX;
+    property public static final float DefaultScaleY;
     property public static final int DefaultStrokeLineCap;
     property public static final int DefaultStrokeLineJoin;
+    property public static final float DefaultStrokeLineMiter;
+    property public static final float DefaultStrokeLineWidth;
     property public static final int DefaultTintBlendMode;
     property public static final long DefaultTintColor;
+    property public static final float DefaultTranslationX;
+    property public static final float DefaultTranslationY;
+    property public static final float DefaultTrimPathEnd;
+    property public static final float DefaultTrimPathOffset;
+    property public static final float DefaultTrimPathStart;
     property public static final java.util.List<androidx.compose.ui.graphics.vector.PathNode> EmptyPath;
     field public static final String DefaultGroupName = "";
     field public static final String DefaultPathName = "";
@@ -1044,6 +1062,7 @@
     method @androidx.compose.runtime.Composable public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(androidx.compose.ui.graphics.vector.ImageVector image);
     method @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, optional boolean autoMirror, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
     method @Deprecated @androidx.compose.runtime.Composable @androidx.compose.runtime.ComposableOpenTarget(index=0xffffffff) public static androidx.compose.ui.graphics.vector.VectorPainter rememberVectorPainter(float defaultWidth, float defaultHeight, optional float viewportWidth, optional float viewportHeight, optional String name, optional long tintColor, optional int tintBlendMode, kotlin.jvm.functions.Function2<? super java.lang.Float,? super java.lang.Float,kotlin.Unit> content);
+    property public static final String RootGroupName;
     field public static final String RootGroupName = "VectorRootGroup";
   }
 
@@ -2251,6 +2270,7 @@
   }
 
   public static final class AlignmentLine.Companion {
+    property public static final int Unspecified;
   }
 
   public final class AlignmentLineKt {
@@ -2475,6 +2495,7 @@
     method public androidx.compose.ui.layout.LayoutCoordinates getLookaheadScopeCoordinates(androidx.compose.ui.layout.Placeable.PlacementScope);
     method public default long localLookaheadPositionOf(androidx.compose.ui.layout.LayoutCoordinates, androidx.compose.ui.layout.LayoutCoordinates sourceCoordinates, optional long relativeToSource, optional boolean includeMotionFrameOfReference);
     method public androidx.compose.ui.layout.LayoutCoordinates toLookaheadCoordinates(androidx.compose.ui.layout.LayoutCoordinates);
+    property public androidx.compose.ui.layout.LayoutCoordinates lookaheadScopeCoordinates;
   }
 
   public final class LookaheadScopeKt {
@@ -2772,6 +2793,7 @@
     method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
     method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
     method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
+    property public T current;
     property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;
   }
 
@@ -2798,6 +2820,7 @@
 
   public interface ModifierLocalReadScope {
     method public <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+    property public T current;
   }
 
   @androidx.compose.runtime.Stable public final class ProvidableModifierLocal<T> extends androidx.compose.ui.modifier.ModifierLocal<T> {
@@ -3940,11 +3963,38 @@
     method public static void setTraversalIndex(androidx.compose.ui.semantics.SemanticsPropertyReceiver, float);
     method public static void setVerticalScrollAxisRange(androidx.compose.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.semantics.ScrollAxisRange);
     method public static void showTextSubstitution(androidx.compose.ui.semantics.SemanticsPropertyReceiver, optional String? label, kotlin.jvm.functions.Function1<? super java.lang.Boolean,java.lang.Boolean>? action);
+    property public final androidx.compose.ui.semantics.CollectionInfo collectionInfo;
+    property public final androidx.compose.ui.semantics.CollectionItemInfo collectionItemInfo;
+    property public final int contentDataType;
+    property public final androidx.compose.ui.autofill.ContentType contentType;
+    property public final java.util.List<? extends androidx.compose.ui.semantics.CustomAccessibilityAction> customActions;
+    property public final androidx.compose.ui.text.AnnotatedString editableText;
+    property public final boolean focused;
+    property public final androidx.compose.ui.semantics.ScrollAxisRange horizontalScrollAxisRange;
+    property @Deprecated public final int imeAction;
+    property @Deprecated public final boolean isContainer;
+    property public final boolean isEditable;
+    property public final boolean isShowingTextSubstitution;
+    property public final boolean isTraversalGroup;
+    property public final int liveRegion;
+    property public final int maxTextLength;
+    property public final String paneTitle;
+    property public final androidx.compose.ui.semantics.ProgressBarRangeInfo progressBarRangeInfo;
+    property public final int role;
+    property public final boolean selected;
+    property public final String stateDescription;
+    property public final String testTag;
+    property public final long textSelectionRange;
+    property public final androidx.compose.ui.text.AnnotatedString textSubstitution;
+    property public final androidx.compose.ui.state.ToggleableState toggleableState;
+    property public final float traversalIndex;
+    property public final androidx.compose.ui.semantics.ScrollAxisRange verticalScrollAxisRange;
   }
 
   public final class SemanticsProperties_androidKt {
     method public static boolean getTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver);
     method public static void setTestTagsAsResourceId(androidx.compose.ui.semantics.SemanticsPropertyReceiver, boolean);
+    property public final boolean testTagsAsResourceId;
   }
 
   public final class SemanticsPropertyKey<T> {
diff --git a/constraintlayout/constraintlayout-compose/api/1.1.0-beta01.txt b/constraintlayout/constraintlayout-compose/api/1.1.0-beta01.txt
index fb78adea..ad21c10e 100644
--- a/constraintlayout/constraintlayout-compose/api/1.1.0-beta01.txt
+++ b/constraintlayout/constraintlayout-compose/api/1.1.0-beta01.txt
@@ -722,6 +722,7 @@
     method public float getStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope);
     method public void setStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope, float);
     method public void transition(androidx.constraintlayout.compose.ConstraintSetRef from, androidx.constraintlayout.compose.ConstraintSetRef to, optional String? name, kotlin.jvm.functions.Function1<? super androidx.constraintlayout.compose.TransitionScope,kotlin.Unit> transitionContent);
+    property public final float staggeredWeight;
   }
 
   public final class MotionSceneScope.ConstrainedLayoutReferences {
diff --git a/constraintlayout/constraintlayout-compose/api/current.txt b/constraintlayout/constraintlayout-compose/api/current.txt
index fb78adea..ad21c10e 100644
--- a/constraintlayout/constraintlayout-compose/api/current.txt
+++ b/constraintlayout/constraintlayout-compose/api/current.txt
@@ -722,6 +722,7 @@
     method public float getStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope);
     method public void setStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope, float);
     method public void transition(androidx.constraintlayout.compose.ConstraintSetRef from, androidx.constraintlayout.compose.ConstraintSetRef to, optional String? name, kotlin.jvm.functions.Function1<? super androidx.constraintlayout.compose.TransitionScope,kotlin.Unit> transitionContent);
+    property public final float staggeredWeight;
   }
 
   public final class MotionSceneScope.ConstrainedLayoutReferences {
diff --git a/constraintlayout/constraintlayout-compose/api/restricted_1.1.0-beta01.txt b/constraintlayout/constraintlayout-compose/api/restricted_1.1.0-beta01.txt
index c278314..c53ea739 100644
--- a/constraintlayout/constraintlayout-compose/api/restricted_1.1.0-beta01.txt
+++ b/constraintlayout/constraintlayout-compose/api/restricted_1.1.0-beta01.txt
@@ -809,6 +809,7 @@
     method public float getStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope);
     method public void setStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope, float);
     method public void transition(androidx.constraintlayout.compose.ConstraintSetRef from, androidx.constraintlayout.compose.ConstraintSetRef to, optional String? name, kotlin.jvm.functions.Function1<? super androidx.constraintlayout.compose.TransitionScope,kotlin.Unit> transitionContent);
+    property public final float staggeredWeight;
   }
 
   public final class MotionSceneScope.ConstrainedLayoutReferences {
diff --git a/constraintlayout/constraintlayout-compose/api/restricted_current.txt b/constraintlayout/constraintlayout-compose/api/restricted_current.txt
index c278314..c53ea739 100644
--- a/constraintlayout/constraintlayout-compose/api/restricted_current.txt
+++ b/constraintlayout/constraintlayout-compose/api/restricted_current.txt
@@ -809,6 +809,7 @@
     method public float getStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope);
     method public void setStaggeredWeight(androidx.constraintlayout.compose.ConstrainScope, float);
     method public void transition(androidx.constraintlayout.compose.ConstraintSetRef from, androidx.constraintlayout.compose.ConstraintSetRef to, optional String? name, kotlin.jvm.functions.Function1<? super androidx.constraintlayout.compose.TransitionScope,kotlin.Unit> transitionContent);
+    property public final float staggeredWeight;
   }
 
   public final class MotionSceneScope.ConstrainedLayoutReferences {
diff --git a/core/core-i18n/api/current.txt b/core/core-i18n/api/current.txt
index 8c19f6c..9d10bc3 100644
--- a/core/core-i18n/api/current.txt
+++ b/core/core-i18n/api/current.txt
@@ -37,6 +37,26 @@
   }
 
   public static final class DateTimeFormatterCommonOptions.Companion {
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions ABBR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions ABBR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR24_MINUTE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR24_MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR_MINUTE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR_MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions NUM_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions NUM_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH_WEEKDAY_DAY;
   }
 
   public final class DateTimeFormatterJdkStyleOptions {
@@ -105,6 +125,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Day.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Era {
@@ -120,6 +143,10 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Era.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.FractionalSecond {
@@ -135,6 +162,10 @@
 
   public static final class DateTimeFormatterSkeletonOptions.FractionalSecond.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_1_DIGIT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_2_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_3_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Hour {
@@ -153,6 +184,13 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Hour.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_12H_NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_12H_TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_24H_NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_24H_TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Minute {
@@ -167,6 +205,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Minute.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Month {
@@ -184,6 +225,12 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Month.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Period {
@@ -200,6 +247,11 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Period.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period FLEXIBLE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Second {
@@ -214,6 +266,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Second.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Timezone {
@@ -232,6 +287,13 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Timezone.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG_GENERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG_OFFSET;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT_GENERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT_OFFSET;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.WeekDay {
@@ -248,6 +310,11 @@
 
   public static final class DateTimeFormatterSkeletonOptions.WeekDay.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay SHORT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Year {
@@ -262,6 +329,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Year.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year TWO_DIGITS;
   }
 
   public final class MessageFormat {
diff --git a/core/core-i18n/api/restricted_current.txt b/core/core-i18n/api/restricted_current.txt
index 8c19f6c..9d10bc3 100644
--- a/core/core-i18n/api/restricted_current.txt
+++ b/core/core-i18n/api/restricted_current.txt
@@ -37,6 +37,26 @@
   }
 
   public static final class DateTimeFormatterCommonOptions.Companion {
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions ABBR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions ABBR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR24_MINUTE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR24_MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR_MINUTE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions HOUR_MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MINUTE_SECOND;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions NUM_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions NUM_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_ABBR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_MONTH_WEEKDAY_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH_DAY;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions YEAR_NUM_MONTH_WEEKDAY_DAY;
   }
 
   public final class DateTimeFormatterJdkStyleOptions {
@@ -105,6 +125,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Day.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Day TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Era {
@@ -120,6 +143,10 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Era.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Era WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.FractionalSecond {
@@ -135,6 +162,10 @@
 
   public static final class DateTimeFormatterSkeletonOptions.FractionalSecond.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_1_DIGIT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_2_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.FractionalSecond NUMERIC_3_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Hour {
@@ -153,6 +184,13 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Hour.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_12H_NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_12H_TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_24H_NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour FORCE_24H_TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Hour TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Minute {
@@ -167,6 +205,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Minute.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Minute TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Month {
@@ -184,6 +225,12 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Month.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month TWO_DIGITS;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Month WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Period {
@@ -200,6 +247,11 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Period.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period FLEXIBLE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Period WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Second {
@@ -214,6 +266,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Second.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Second TWO_DIGITS;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Timezone {
@@ -232,6 +287,13 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Timezone.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG_GENERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone LONG_OFFSET;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT_GENERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Timezone SHORT_OFFSET;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.WeekDay {
@@ -248,6 +310,11 @@
 
   public static final class DateTimeFormatterSkeletonOptions.WeekDay.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay ABBREVIATED;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay NARROW;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay SHORT;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.WeekDay WIDE;
   }
 
   public static final class DateTimeFormatterSkeletonOptions.Year {
@@ -262,6 +329,9 @@
 
   public static final class DateTimeFormatterSkeletonOptions.Year.Companion {
     method public androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year fromString(String value);
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year NONE;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year NUMERIC;
+    property public final androidx.core.i18n.DateTimeFormatterSkeletonOptions.Year TWO_DIGITS;
   }
 
   public final class MessageFormat {
diff --git a/core/core-telecom/api/current.txt b/core/core-telecom/api/current.txt
index 8468a41..71ab7a1 100644
--- a/core/core-telecom/api/current.txt
+++ b/core/core-telecom/api/current.txt
@@ -26,6 +26,13 @@
   }
 
   public static final class CallAttributesCompat.Companion {
+    property public static final int CALL_TYPE_AUDIO_CALL;
+    property public static final int CALL_TYPE_VIDEO_CALL;
+    property public static final int DIRECTION_INCOMING;
+    property public static final int DIRECTION_OUTGOING;
+    property public static final int SUPPORTS_SET_INACTIVE;
+    property public static final int SUPPORTS_STREAM;
+    property public static final int SUPPORTS_TRANSFER;
   }
 
   public abstract sealed class CallControlResult {
@@ -75,6 +82,12 @@
   }
 
   public static final class CallEndpointCompat.Companion {
+    property public static final int TYPE_BLUETOOTH;
+    property public static final int TYPE_EARPIECE;
+    property public static final int TYPE_SPEAKER;
+    property public static final int TYPE_STREAMING;
+    property public static final int TYPE_UNKNOWN;
+    property public static final int TYPE_WIRED_HEADSET;
   }
 
   public final class CallException extends java.lang.RuntimeException {
@@ -94,6 +107,14 @@
   }
 
   public static final class CallException.Companion {
+    property public static final int ERROR_BLUETOOTH_DEVICE_IS_NULL;
+    property public static final int ERROR_CALL_CANNOT_BE_SET_TO_ACTIVE;
+    property public static final int ERROR_CALL_DOES_NOT_SUPPORT_HOLD;
+    property public static final int ERROR_CALL_IS_NOT_BEING_TRACKED;
+    property public static final int ERROR_CALL_NOT_PERMITTED_AT_PRESENT_TIME;
+    property public static final int ERROR_CANNOT_HOLD_CURRENT_ACTIVE_CALL;
+    property public static final int ERROR_OPERATION_TIMED_OUT;
+    property public static final int ERROR_UNKNOWN;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.O) public final class CallsManager implements androidx.core.telecom.extensions.CallsManagerExtensions {
@@ -109,6 +130,9 @@
   }
 
   public static final class CallsManager.Companion {
+    property public static final int CAPABILITY_BASELINE;
+    property public static final int CAPABILITY_SUPPORTS_CALL_STREAMING;
+    property public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.O) public class InCallServiceCompat extends android.telecom.InCallService implements androidx.core.telecom.extensions.CallExtensions androidx.lifecycle.LifecycleOwner {
diff --git a/core/core-telecom/api/restricted_current.txt b/core/core-telecom/api/restricted_current.txt
index 8468a41..71ab7a1 100644
--- a/core/core-telecom/api/restricted_current.txt
+++ b/core/core-telecom/api/restricted_current.txt
@@ -26,6 +26,13 @@
   }
 
   public static final class CallAttributesCompat.Companion {
+    property public static final int CALL_TYPE_AUDIO_CALL;
+    property public static final int CALL_TYPE_VIDEO_CALL;
+    property public static final int DIRECTION_INCOMING;
+    property public static final int DIRECTION_OUTGOING;
+    property public static final int SUPPORTS_SET_INACTIVE;
+    property public static final int SUPPORTS_STREAM;
+    property public static final int SUPPORTS_TRANSFER;
   }
 
   public abstract sealed class CallControlResult {
@@ -75,6 +82,12 @@
   }
 
   public static final class CallEndpointCompat.Companion {
+    property public static final int TYPE_BLUETOOTH;
+    property public static final int TYPE_EARPIECE;
+    property public static final int TYPE_SPEAKER;
+    property public static final int TYPE_STREAMING;
+    property public static final int TYPE_UNKNOWN;
+    property public static final int TYPE_WIRED_HEADSET;
   }
 
   public final class CallException extends java.lang.RuntimeException {
@@ -94,6 +107,14 @@
   }
 
   public static final class CallException.Companion {
+    property public static final int ERROR_BLUETOOTH_DEVICE_IS_NULL;
+    property public static final int ERROR_CALL_CANNOT_BE_SET_TO_ACTIVE;
+    property public static final int ERROR_CALL_DOES_NOT_SUPPORT_HOLD;
+    property public static final int ERROR_CALL_IS_NOT_BEING_TRACKED;
+    property public static final int ERROR_CALL_NOT_PERMITTED_AT_PRESENT_TIME;
+    property public static final int ERROR_CANNOT_HOLD_CURRENT_ACTIVE_CALL;
+    property public static final int ERROR_OPERATION_TIMED_OUT;
+    property public static final int ERROR_UNKNOWN;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.O) public final class CallsManager implements androidx.core.telecom.extensions.CallsManagerExtensions {
@@ -109,6 +130,9 @@
   }
 
   public static final class CallsManager.Companion {
+    property public static final int CAPABILITY_BASELINE;
+    property public static final int CAPABILITY_SUPPORTS_CALL_STREAMING;
+    property public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.O) public class InCallServiceCompat extends android.telecom.InCallService implements androidx.core.telecom.extensions.CallExtensions androidx.lifecycle.LifecycleOwner {
diff --git a/core/core/api/current.txt b/core/core/api/current.txt
index 871e652..e9dd1be 100644
--- a/core/core/api/current.txt
+++ b/core/core/api/current.txt
@@ -1859,6 +1859,8 @@
   }
 
   public static final class BufferFillPolicy.Companion {
+    property public final androidx.core.os.BufferFillPolicy DISCARD;
+    property public final androidx.core.os.BufferFillPolicy RING_BUFFER;
   }
 
   public final class BuildCompat {
@@ -1874,6 +1876,10 @@
     method @Deprecated @ChecksSdkIntAtLeast(api=33, codename="Tiramisu") public static boolean isAtLeastT();
     method @Deprecated @ChecksSdkIntAtLeast(api=34, codename="UpsideDownCake") public static boolean isAtLeastU();
     method @ChecksSdkIntAtLeast(api=35, codename="VanillaIceCream") public static boolean isAtLeastV();
+    property @ChecksSdkIntAtLeast(extension=android.os.ext.SdkExtensions.AD_SERVICES) public final int AD_SERVICES_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.R) public final int R_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.S) public final int S_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.TIRAMISU) public final int T_EXTENSION_INT;
     field @ChecksSdkIntAtLeast(extension=android.os.ext.SdkExtensions.AD_SERVICES) public static final int AD_SERVICES_EXTENSION_INT;
     field public static final androidx.core.os.BuildCompat INSTANCE;
     field @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.R) public static final int R_EXTENSION_INT;
diff --git a/core/core/api/restricted_current.txt b/core/core/api/restricted_current.txt
index d13deea..a7e6278 100644
--- a/core/core/api/restricted_current.txt
+++ b/core/core/api/restricted_current.txt
@@ -2252,6 +2252,8 @@
   }
 
   public static final class BufferFillPolicy.Companion {
+    property public final androidx.core.os.BufferFillPolicy DISCARD;
+    property public final androidx.core.os.BufferFillPolicy RING_BUFFER;
   }
 
   public final class BuildCompat {
@@ -2267,6 +2269,10 @@
     method @Deprecated @ChecksSdkIntAtLeast(api=33, codename="Tiramisu") public static boolean isAtLeastT();
     method @Deprecated @ChecksSdkIntAtLeast(api=34, codename="UpsideDownCake") public static boolean isAtLeastU();
     method @ChecksSdkIntAtLeast(api=35, codename="VanillaIceCream") public static boolean isAtLeastV();
+    property @ChecksSdkIntAtLeast(extension=android.os.ext.SdkExtensions.AD_SERVICES) public final int AD_SERVICES_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.R) public final int R_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.S) public final int S_EXTENSION_INT;
+    property @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.TIRAMISU) public final int T_EXTENSION_INT;
     field @ChecksSdkIntAtLeast(extension=android.os.ext.SdkExtensions.AD_SERVICES) public static final int AD_SERVICES_EXTENSION_INT;
     field public static final androidx.core.os.BuildCompat INSTANCE;
     field @ChecksSdkIntAtLeast(extension=android.os.Build.VERSION_CODES.R) public static final int R_EXTENSION_INT;
diff --git a/core/haptics/haptics/api/current.txt b/core/haptics/haptics/api/current.txt
index 1800af9..763ba66 100644
--- a/core/haptics/haptics/api/current.txt
+++ b/core/haptics/haptics/api/current.txt
@@ -35,6 +35,17 @@
   }
 
   public static final class HapticAttributes.Companion {
+    property public static final int FLAG_BYPASS_INTERRUPTION_POLICY;
+    property public static final int USAGE_ACCESSIBILITY;
+    property public static final int USAGE_ALARM;
+    property public static final int USAGE_COMMUNICATION_REQUEST;
+    property public static final int USAGE_HARDWARE_FEEDBACK;
+    property public static final int USAGE_MEDIA;
+    property public static final int USAGE_NOTIFICATION;
+    property public static final int USAGE_PHYSICAL_EMULATION;
+    property public static final int USAGE_RINGTONE;
+    property public static final int USAGE_TOUCH;
+    property public static final int USAGE_UNKNOWN;
   }
 
   public interface HapticManager {
@@ -167,6 +178,14 @@
   }
 
   public static final class CompositionSignal.PrimitiveAtom.Companion {
+    property public static final int CLICK;
+    property public static final int LOW_TICK;
+    property public static final int QUICK_FALL;
+    property public static final int QUICK_RISE;
+    property public static final int SLOW_RISE;
+    property public static final int SPIN;
+    property public static final int THUD;
+    property public static final int TICK;
   }
 
   public final class FallbackChainSignal implements androidx.core.haptics.signal.ResolvableSignal {
@@ -260,6 +279,7 @@
   }
 
   public static final class WaveformSignal.ConstantVibrationAtom.Companion {
+    property public static final float DEFAULT_AMPLITUDE;
   }
 
 }
diff --git a/core/haptics/haptics/api/restricted_current.txt b/core/haptics/haptics/api/restricted_current.txt
index 1800af9..763ba66 100644
--- a/core/haptics/haptics/api/restricted_current.txt
+++ b/core/haptics/haptics/api/restricted_current.txt
@@ -35,6 +35,17 @@
   }
 
   public static final class HapticAttributes.Companion {
+    property public static final int FLAG_BYPASS_INTERRUPTION_POLICY;
+    property public static final int USAGE_ACCESSIBILITY;
+    property public static final int USAGE_ALARM;
+    property public static final int USAGE_COMMUNICATION_REQUEST;
+    property public static final int USAGE_HARDWARE_FEEDBACK;
+    property public static final int USAGE_MEDIA;
+    property public static final int USAGE_NOTIFICATION;
+    property public static final int USAGE_PHYSICAL_EMULATION;
+    property public static final int USAGE_RINGTONE;
+    property public static final int USAGE_TOUCH;
+    property public static final int USAGE_UNKNOWN;
   }
 
   public interface HapticManager {
@@ -167,6 +178,14 @@
   }
 
   public static final class CompositionSignal.PrimitiveAtom.Companion {
+    property public static final int CLICK;
+    property public static final int LOW_TICK;
+    property public static final int QUICK_FALL;
+    property public static final int QUICK_RISE;
+    property public static final int SLOW_RISE;
+    property public static final int SPIN;
+    property public static final int THUD;
+    property public static final int TICK;
   }
 
   public final class FallbackChainSignal implements androidx.core.haptics.signal.ResolvableSignal {
@@ -260,6 +279,7 @@
   }
 
   public static final class WaveformSignal.ConstantVibrationAtom.Companion {
+    property public static final float DEFAULT_AMPLITUDE;
   }
 
 }
diff --git a/core/uwb/uwb/api/current.txt b/core/uwb/uwb/api/current.txt
index dce644d..f1b3999 100644
--- a/core/uwb/uwb/api/current.txt
+++ b/core/uwb/uwb/api/current.txt
@@ -81,6 +81,16 @@
   }
 
   public static final class RangingParameters.Companion {
+    property public static final int CONFIG_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_INDIVIDUAL_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_UNICAST_DS_TWR;
+    property public static final int CONFIG_UNICAST_DS_TWR;
+    property public static final long RANGING_SLOT_DURATION_1_MILLIS;
+    property public static final long RANGING_SLOT_DURATION_2_MILLIS;
+    property public static final int RANGING_UPDATE_RATE_AUTOMATIC;
+    property public static final int RANGING_UPDATE_RATE_FREQUENT;
+    property public static final int RANGING_UPDATE_RATE_INFREQUENT;
   }
 
   public final class RangingPosition {
diff --git a/core/uwb/uwb/api/restricted_current.txt b/core/uwb/uwb/api/restricted_current.txt
index dce644d..f1b3999 100644
--- a/core/uwb/uwb/api/restricted_current.txt
+++ b/core/uwb/uwb/api/restricted_current.txt
@@ -81,6 +81,16 @@
   }
 
   public static final class RangingParameters.Companion {
+    property public static final int CONFIG_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_INDIVIDUAL_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_MULTICAST_DS_TWR;
+    property public static final int CONFIG_PROVISIONED_UNICAST_DS_TWR;
+    property public static final int CONFIG_UNICAST_DS_TWR;
+    property public static final long RANGING_SLOT_DURATION_1_MILLIS;
+    property public static final long RANGING_SLOT_DURATION_2_MILLIS;
+    property public static final int RANGING_UPDATE_RATE_AUTOMATIC;
+    property public static final int RANGING_UPDATE_RATE_FREQUENT;
+    property public static final int RANGING_UPDATE_RATE_INFREQUENT;
   }
 
   public final class RangingPosition {
diff --git a/credentials/credentials-e2ee/api/current.txt b/credentials/credentials-e2ee/api/current.txt
index 0cae4cc..16518e3 100644
--- a/credentials/credentials-e2ee/api/current.txt
+++ b/credentials/credentials-e2ee/api/current.txt
@@ -16,6 +16,8 @@
 
   public static final class IdentityKey.Companion {
     method @WorkerThread public androidx.credentials.e2ee.IdentityKey createFromPrf(byte[] prf, byte[]? salt, int keyType);
+    property public static final int IDENTITY_KEY_TYPE_ED25519;
+    property public static final int IDENTITY_KEY_TYPE_RESERVED;
   }
 
 }
diff --git a/credentials/credentials-e2ee/api/restricted_current.txt b/credentials/credentials-e2ee/api/restricted_current.txt
index 0cae4cc..16518e3 100644
--- a/credentials/credentials-e2ee/api/restricted_current.txt
+++ b/credentials/credentials-e2ee/api/restricted_current.txt
@@ -16,6 +16,8 @@
 
   public static final class IdentityKey.Companion {
     method @WorkerThread public androidx.credentials.e2ee.IdentityKey createFromPrf(byte[] prf, byte[]? salt, int keyType);
+    property public static final int IDENTITY_KEY_TYPE_ED25519;
+    property public static final int IDENTITY_KEY_TYPE_RESERVED;
   }
 
 }
diff --git a/credentials/credentials/api/1.5.0-beta01.txt b/credentials/credentials/api/1.5.0-beta01.txt
index f753fce..44d2a1b 100644
--- a/credentials/credentials/api/1.5.0-beta01.txt
+++ b/credentials/credentials/api/1.5.0-beta01.txt
@@ -14,6 +14,8 @@
   }
 
   public static final class ClearCredentialStateRequest.Companion {
+    property public static final String TYPE_CLEAR_CREDENTIAL_STATE;
+    property public static final String TYPE_CLEAR_RESTORE_CREDENTIAL;
   }
 
   public abstract class CreateCredentialRequest {
@@ -136,6 +138,7 @@
   }
 
   public static final class CreateRestoreCredentialResponse.Companion {
+    property public static final String BUNDLE_KEY_CREATE_RESTORE_CREDENTIAL_RESPONSE;
   }
 
   public abstract class Credential {
@@ -210,6 +213,10 @@
   public static final class CredentialOption.Companion {
     method @RequiresApi(34) public androidx.credentials.CredentialOption createFrom(android.credentials.CredentialOption option);
     method public androidx.credentials.CredentialOption createFrom(String type, android.os.Bundle requestData, android.os.Bundle candidateQueryData, boolean requireSystemProvider, java.util.Set<android.content.ComponentName> allowedProviders);
+    property public static final int PRIORITY_DEFAULT;
+    property public static final int PRIORITY_OIDC_OR_SIMILAR;
+    property public static final int PRIORITY_PASSKEY_OR_SIMILAR;
+    property public static final int PRIORITY_PASSWORD_OR_SIMILAR;
   }
 
   public interface CredentialProvider {
@@ -234,6 +241,7 @@
   }
 
   public static final class DigitalCredential.Companion {
+    property public static final String TYPE_DIGITAL_CREDENTIAL;
   }
 
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This CredentialManager API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalDigitalCredentialApi {
@@ -333,6 +341,7 @@
   }
 
   public static final class PasswordCredential.Companion {
+    property public static final String TYPE_PASSWORD_CREDENTIAL;
   }
 
   public final class PendingGetCredentialRequest {
@@ -380,6 +389,7 @@
   }
 
   public static final class PublicKeyCredential.Companion {
+    property public static final String TYPE_PUBLIC_KEY_CREDENTIAL;
   }
 
   public final class RestoreCredential extends androidx.credentials.Credential {
@@ -390,6 +400,7 @@
   }
 
   public static final class RestoreCredential.Companion {
+    property public static final String TYPE_RESTORE_CREDENTIAL;
   }
 
 }
diff --git a/credentials/credentials/api/current.txt b/credentials/credentials/api/current.txt
index f753fce..44d2a1b 100644
--- a/credentials/credentials/api/current.txt
+++ b/credentials/credentials/api/current.txt
@@ -14,6 +14,8 @@
   }
 
   public static final class ClearCredentialStateRequest.Companion {
+    property public static final String TYPE_CLEAR_CREDENTIAL_STATE;
+    property public static final String TYPE_CLEAR_RESTORE_CREDENTIAL;
   }
 
   public abstract class CreateCredentialRequest {
@@ -136,6 +138,7 @@
   }
 
   public static final class CreateRestoreCredentialResponse.Companion {
+    property public static final String BUNDLE_KEY_CREATE_RESTORE_CREDENTIAL_RESPONSE;
   }
 
   public abstract class Credential {
@@ -210,6 +213,10 @@
   public static final class CredentialOption.Companion {
     method @RequiresApi(34) public androidx.credentials.CredentialOption createFrom(android.credentials.CredentialOption option);
     method public androidx.credentials.CredentialOption createFrom(String type, android.os.Bundle requestData, android.os.Bundle candidateQueryData, boolean requireSystemProvider, java.util.Set<android.content.ComponentName> allowedProviders);
+    property public static final int PRIORITY_DEFAULT;
+    property public static final int PRIORITY_OIDC_OR_SIMILAR;
+    property public static final int PRIORITY_PASSKEY_OR_SIMILAR;
+    property public static final int PRIORITY_PASSWORD_OR_SIMILAR;
   }
 
   public interface CredentialProvider {
@@ -234,6 +241,7 @@
   }
 
   public static final class DigitalCredential.Companion {
+    property public static final String TYPE_DIGITAL_CREDENTIAL;
   }
 
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This CredentialManager API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalDigitalCredentialApi {
@@ -333,6 +341,7 @@
   }
 
   public static final class PasswordCredential.Companion {
+    property public static final String TYPE_PASSWORD_CREDENTIAL;
   }
 
   public final class PendingGetCredentialRequest {
@@ -380,6 +389,7 @@
   }
 
   public static final class PublicKeyCredential.Companion {
+    property public static final String TYPE_PUBLIC_KEY_CREDENTIAL;
   }
 
   public final class RestoreCredential extends androidx.credentials.Credential {
@@ -390,6 +400,7 @@
   }
 
   public static final class RestoreCredential.Companion {
+    property public static final String TYPE_RESTORE_CREDENTIAL;
   }
 
 }
diff --git a/credentials/credentials/api/restricted_1.5.0-beta01.txt b/credentials/credentials/api/restricted_1.5.0-beta01.txt
index f753fce..44d2a1b 100644
--- a/credentials/credentials/api/restricted_1.5.0-beta01.txt
+++ b/credentials/credentials/api/restricted_1.5.0-beta01.txt
@@ -14,6 +14,8 @@
   }
 
   public static final class ClearCredentialStateRequest.Companion {
+    property public static final String TYPE_CLEAR_CREDENTIAL_STATE;
+    property public static final String TYPE_CLEAR_RESTORE_CREDENTIAL;
   }
 
   public abstract class CreateCredentialRequest {
@@ -136,6 +138,7 @@
   }
 
   public static final class CreateRestoreCredentialResponse.Companion {
+    property public static final String BUNDLE_KEY_CREATE_RESTORE_CREDENTIAL_RESPONSE;
   }
 
   public abstract class Credential {
@@ -210,6 +213,10 @@
   public static final class CredentialOption.Companion {
     method @RequiresApi(34) public androidx.credentials.CredentialOption createFrom(android.credentials.CredentialOption option);
     method public androidx.credentials.CredentialOption createFrom(String type, android.os.Bundle requestData, android.os.Bundle candidateQueryData, boolean requireSystemProvider, java.util.Set<android.content.ComponentName> allowedProviders);
+    property public static final int PRIORITY_DEFAULT;
+    property public static final int PRIORITY_OIDC_OR_SIMILAR;
+    property public static final int PRIORITY_PASSKEY_OR_SIMILAR;
+    property public static final int PRIORITY_PASSWORD_OR_SIMILAR;
   }
 
   public interface CredentialProvider {
@@ -234,6 +241,7 @@
   }
 
   public static final class DigitalCredential.Companion {
+    property public static final String TYPE_DIGITAL_CREDENTIAL;
   }
 
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This CredentialManager API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalDigitalCredentialApi {
@@ -333,6 +341,7 @@
   }
 
   public static final class PasswordCredential.Companion {
+    property public static final String TYPE_PASSWORD_CREDENTIAL;
   }
 
   public final class PendingGetCredentialRequest {
@@ -380,6 +389,7 @@
   }
 
   public static final class PublicKeyCredential.Companion {
+    property public static final String TYPE_PUBLIC_KEY_CREDENTIAL;
   }
 
   public final class RestoreCredential extends androidx.credentials.Credential {
@@ -390,6 +400,7 @@
   }
 
   public static final class RestoreCredential.Companion {
+    property public static final String TYPE_RESTORE_CREDENTIAL;
   }
 
 }
diff --git a/credentials/credentials/api/restricted_current.txt b/credentials/credentials/api/restricted_current.txt
index f753fce..44d2a1b 100644
--- a/credentials/credentials/api/restricted_current.txt
+++ b/credentials/credentials/api/restricted_current.txt
@@ -14,6 +14,8 @@
   }
 
   public static final class ClearCredentialStateRequest.Companion {
+    property public static final String TYPE_CLEAR_CREDENTIAL_STATE;
+    property public static final String TYPE_CLEAR_RESTORE_CREDENTIAL;
   }
 
   public abstract class CreateCredentialRequest {
@@ -136,6 +138,7 @@
   }
 
   public static final class CreateRestoreCredentialResponse.Companion {
+    property public static final String BUNDLE_KEY_CREATE_RESTORE_CREDENTIAL_RESPONSE;
   }
 
   public abstract class Credential {
@@ -210,6 +213,10 @@
   public static final class CredentialOption.Companion {
     method @RequiresApi(34) public androidx.credentials.CredentialOption createFrom(android.credentials.CredentialOption option);
     method public androidx.credentials.CredentialOption createFrom(String type, android.os.Bundle requestData, android.os.Bundle candidateQueryData, boolean requireSystemProvider, java.util.Set<android.content.ComponentName> allowedProviders);
+    property public static final int PRIORITY_DEFAULT;
+    property public static final int PRIORITY_OIDC_OR_SIMILAR;
+    property public static final int PRIORITY_PASSKEY_OR_SIMILAR;
+    property public static final int PRIORITY_PASSWORD_OR_SIMILAR;
   }
 
   public interface CredentialProvider {
@@ -234,6 +241,7 @@
   }
 
   public static final class DigitalCredential.Companion {
+    property public static final String TYPE_DIGITAL_CREDENTIAL;
   }
 
   @SuppressCompatibility @kotlin.RequiresOptIn(message="This CredentialManager API is experimental and is likely to change or to be removed in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalDigitalCredentialApi {
@@ -333,6 +341,7 @@
   }
 
   public static final class PasswordCredential.Companion {
+    property public static final String TYPE_PASSWORD_CREDENTIAL;
   }
 
   public final class PendingGetCredentialRequest {
@@ -380,6 +389,7 @@
   }
 
   public static final class PublicKeyCredential.Companion {
+    property public static final String TYPE_PUBLIC_KEY_CREDENTIAL;
   }
 
   public final class RestoreCredential extends androidx.credentials.Credential {
@@ -390,6 +400,7 @@
   }
 
   public static final class RestoreCredential.Companion {
+    property public static final String TYPE_RESTORE_CREDENTIAL;
   }
 
 }
diff --git a/credentials/registry/registry-provider/api/current.txt b/credentials/registry/registry-provider/api/current.txt
index 5046fc2..46eb7fd 100644
--- a/credentials/registry/registry-provider/api/current.txt
+++ b/credentials/registry/registry-provider/api/current.txt
@@ -53,6 +53,7 @@
 
   public static final class RegistryManager.Companion {
     method public androidx.credentials.registry.provider.RegistryManager create(android.content.Context context);
+    property public static final String ACTION_GET_CREDENTIAL;
   }
 
   public interface RegistryManagerProvider {
@@ -85,6 +86,7 @@
   }
 
   public static final class DigitalCredentialRegistry.Companion {
+    property public static final int DISPLAY_TYPE_VERIFICATION;
   }
 
   public final class DigitalCredentialRegistryResponse extends androidx.credentials.registry.provider.RegisterCredentialsResponse {
diff --git a/credentials/registry/registry-provider/api/restricted_current.txt b/credentials/registry/registry-provider/api/restricted_current.txt
index 5046fc2..46eb7fd 100644
--- a/credentials/registry/registry-provider/api/restricted_current.txt
+++ b/credentials/registry/registry-provider/api/restricted_current.txt
@@ -53,6 +53,7 @@
 
   public static final class RegistryManager.Companion {
     method public androidx.credentials.registry.provider.RegistryManager create(android.content.Context context);
+    property public static final String ACTION_GET_CREDENTIAL;
   }
 
   public interface RegistryManagerProvider {
@@ -85,6 +86,7 @@
   }
 
   public static final class DigitalCredentialRegistry.Companion {
+    property public static final int DISPLAY_TYPE_VERIFICATION;
   }
 
   public final class DigitalCredentialRegistryResponse extends androidx.credentials.registry.provider.RegisterCredentialsResponse {
diff --git a/glance/glance-appwidget/api/current.txt b/glance/glance-appwidget/api/current.txt
index c3d6754..e3bde32 100644
--- a/glance/glance-appwidget/api/current.txt
+++ b/glance/glance-appwidget/api/current.txt
@@ -102,6 +102,7 @@
   }
 
   public static final class GlanceAppWidgetReceiver.Companion {
+    property public static final String ACTION_DEBUG_UPDATE;
   }
 
   @SuppressCompatibility @androidx.glance.appwidget.ExperimentalGlanceRemoteViewsApi public final class GlanceRemoteViews {
@@ -302,6 +303,7 @@
   }
 
   public static final class LazyListScope.Companion {
+    property public static final long UnspecifiedItemId;
     field public static final long UnspecifiedItemId = -9223372036854775808L; // 0x8000000000000000L
   }
 
@@ -325,6 +327,7 @@
   }
 
   public static final class LazyVerticalGridScope.Companion {
+    property public static final long UnspecifiedItemId;
     field public static final long UnspecifiedItemId = -9223372036854775808L; // 0x8000000000000000L
   }
 
diff --git a/glance/glance-appwidget/api/restricted_current.txt b/glance/glance-appwidget/api/restricted_current.txt
index c3d6754..e3bde32 100644
--- a/glance/glance-appwidget/api/restricted_current.txt
+++ b/glance/glance-appwidget/api/restricted_current.txt
@@ -102,6 +102,7 @@
   }
 
   public static final class GlanceAppWidgetReceiver.Companion {
+    property public static final String ACTION_DEBUG_UPDATE;
   }
 
   @SuppressCompatibility @androidx.glance.appwidget.ExperimentalGlanceRemoteViewsApi public final class GlanceRemoteViews {
@@ -302,6 +303,7 @@
   }
 
   public static final class LazyListScope.Companion {
+    property public static final long UnspecifiedItemId;
     field public static final long UnspecifiedItemId = -9223372036854775808L; // 0x8000000000000000L
   }
 
@@ -325,6 +327,7 @@
   }
 
   public static final class LazyVerticalGridScope.Companion {
+    property public static final long UnspecifiedItemId;
     field public static final long UnspecifiedItemId = -9223372036854775808L; // 0x8000000000000000L
   }
 
diff --git a/glance/glance-preview/api/current.txt b/glance/glance-preview/api/current.txt
index e234443..29de1ef 100644
--- a/glance/glance-preview/api/current.txt
+++ b/glance/glance-preview/api/current.txt
@@ -13,6 +13,8 @@
 
   @SuppressCompatibility @androidx.glance.preview.ExperimentalGlancePreviewApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.glance.preview.Preview[] value();
+    property public abstract int heightDp;
+    property public abstract int widthDp;
   }
 
 }
diff --git a/glance/glance-preview/api/restricted_current.txt b/glance/glance-preview/api/restricted_current.txt
index e234443..29de1ef 100644
--- a/glance/glance-preview/api/restricted_current.txt
+++ b/glance/glance-preview/api/restricted_current.txt
@@ -13,6 +13,8 @@
 
   @SuppressCompatibility @androidx.glance.preview.ExperimentalGlancePreviewApi @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.glance.preview.Preview[] value();
+    property public abstract int heightDp;
+    property public abstract int widthDp;
   }
 
 }
diff --git a/glance/glance/api/current.txt b/glance/glance/api/current.txt
index 638518e..de7aefe 100644
--- a/glance/glance/api/current.txt
+++ b/glance/glance/api/current.txt
@@ -131,6 +131,7 @@
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, optional @DrawableRes int rippleOverride, kotlin.jvm.functions.Function0<kotlin.Unit> block);
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, optional String? key, optional @DrawableRes int rippleOverride, kotlin.jvm.functions.Function0<kotlin.Unit> block);
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    property @DrawableRes public static final int NoRippleOverride;
     field @DrawableRes public static final int NoRippleOverride = 0; // 0x0
   }
 
diff --git a/glance/glance/api/restricted_current.txt b/glance/glance/api/restricted_current.txt
index 638518e..de7aefe 100644
--- a/glance/glance/api/restricted_current.txt
+++ b/glance/glance/api/restricted_current.txt
@@ -131,6 +131,7 @@
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, optional @DrawableRes int rippleOverride, kotlin.jvm.functions.Function0<kotlin.Unit> block);
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, optional String? key, optional @DrawableRes int rippleOverride, kotlin.jvm.functions.Function0<kotlin.Unit> block);
     method @androidx.compose.runtime.Composable public static androidx.glance.GlanceModifier clickable(androidx.glance.GlanceModifier, kotlin.jvm.functions.Function0<kotlin.Unit> block);
+    property @DrawableRes public static final int NoRippleOverride;
     field @DrawableRes public static final int NoRippleOverride = 0; // 0x0
   }
 
diff --git a/graphics/graphics-core/api/current.txt b/graphics/graphics-core/api/current.txt
index 09fe8bf..17ae21d 100644
--- a/graphics/graphics-core/api/current.txt
+++ b/graphics/graphics-core/api/current.txt
@@ -49,6 +49,8 @@
   }
 
   public static final class CanvasBufferedRenderer.RenderResult.Companion {
+    property public static final int ERROR_UNKNOWN;
+    property public static final int SUCCESS;
   }
 
 }
@@ -253,6 +255,7 @@
   }
 
   public static final class SyncStrategy.Companion {
+    property public androidx.graphics.opengl.SyncStrategy ALWAYS;
   }
 
 }
@@ -279,6 +282,12 @@
   }
 
   public static final class EGLConfigAttributes.Companion {
+    property public static final int EGL_COLOR_COMPONENT_TYPE_EXT;
+    property public static final int EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
+    property public static final int EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_1010102;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_8888;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_F16;
   }
 
   public final class EGLConfigAttributesKt {
@@ -354,6 +363,7 @@
 
   public static final class EGLSpec.Companion {
     method public String getStatusString(int error);
+    property public androidx.graphics.opengl.egl.EGLSpec V14;
   }
 
   public final class EGLVersion {
@@ -372,6 +382,9 @@
   }
 
   public static final class EGLVersion.Companion {
+    property public final androidx.graphics.opengl.egl.EGLVersion Unknown;
+    property public final androidx.graphics.opengl.egl.EGLVersion V14;
+    property public final androidx.graphics.opengl.egl.EGLVersion V15;
   }
 
 }
@@ -403,6 +416,16 @@
   }
 
   public static final class SurfaceControlCompat.Companion {
+    property public static final int BUFFER_TRANSFORM_IDENTITY;
+    property public static final int BUFFER_TRANSFORM_MIRROR_HORIZONTAL;
+    property public static final int BUFFER_TRANSFORM_MIRROR_VERTICAL;
+    property public static final int BUFFER_TRANSFORM_ROTATE_180;
+    property public static final int BUFFER_TRANSFORM_ROTATE_270;
+    property public static final int BUFFER_TRANSFORM_ROTATE_90;
+    property public static final int CHANGE_FRAME_RATE_ALWAYS;
+    property public static final int CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS;
+    property public static final int FRAME_RATE_COMPATIBILITY_DEFAULT;
+    property public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.Q) public static final class SurfaceControlCompat.Transaction implements java.lang.AutoCloseable {
@@ -467,6 +490,29 @@
   }
 
   public static final class DataSpace.Companion {
+    property public static final int DATASPACE_ADOBE_RGB;
+    property public static final int DATASPACE_BT2020;
+    property public static final int DATASPACE_BT2020_HLG;
+    property public static final int DATASPACE_BT2020_PQ;
+    property public static final int DATASPACE_BT601_525;
+    property public static final int DATASPACE_BT601_625;
+    property public static final int DATASPACE_BT709;
+    property public static final int DATASPACE_DCI_P3;
+    property public static final int DATASPACE_DEPTH;
+    property public static final int DATASPACE_DISPLAY_P3;
+    property public static final int DATASPACE_DYNAMIC_DEPTH;
+    property public static final int DATASPACE_HEIF;
+    property public static final int DATASPACE_JFIF;
+    property public static final int DATASPACE_JPEG_R;
+    property public static final int DATASPACE_SCRGB;
+    property public static final int DATASPACE_SCRGB_LINEAR;
+    property public static final int DATASPACE_SRGB;
+    property public static final int DATASPACE_SRGB_LINEAR;
+    property public static final int DATASPACE_UNKNOWN;
+    property public static final int RANGE_EXTENDED;
+    property public static final int RANGE_FULL;
+    property public static final int RANGE_LIMITED;
+    property public static final int RANGE_UNSPECIFIED;
   }
 
   public final class SyncFenceCompat implements java.lang.AutoCloseable {
@@ -483,6 +529,8 @@
 
   public static final class SyncFenceCompat.Companion {
     method public androidx.hardware.SyncFenceCompat createNativeSyncFence();
+    property public static final long SIGNAL_TIME_INVALID;
+    property public static final long SIGNAL_TIME_PENDING;
   }
 
 }
@@ -542,6 +590,38 @@
     method public boolean eglGetSyncAttribKHR(android.opengl.EGLDisplay eglDisplay, androidx.opengl.EGLSyncKHR sync, int attribute, int[] value, int offset);
     method public void glEGLImageTargetTexture2DOES(int target, androidx.opengl.EGLImageKHR image);
     method public java.util.Set<java.lang.String> parseExtensions(String queryString);
+    property public static final String EGL_ANDROID_CLIENT_BUFFER;
+    property public static final String EGL_ANDROID_IMAGE_NATIVE_BUFFER;
+    property public static final String EGL_ANDROID_NATIVE_FENCE_SYNC;
+    property public static final int EGL_CONDITION_SATISFIED_KHR;
+    property public static final String EGL_EXT_BUFFER_AGE;
+    property public static final String EGL_EXT_GL_COLORSPACE_BT2020_PQ;
+    property public static final String EGL_EXT_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH;
+    property public static final String EGL_EXT_GL_COLORSPACE_SCRGB;
+    property public static final String EGL_EXT_PIXEL_FORMAT_FLOAT;
+    property public static final int EGL_FALSE;
+    property public static final long EGL_FOREVER_KHR;
+    property public static final String EGL_IMG_CONTEXT_PRIORITY;
+    property public static final String EGL_KHR_FENCE_SYNC;
+    property public static final String EGL_KHR_GL_COLORSPACE;
+    property public static final String EGL_KHR_IMAGE;
+    property public static final String EGL_KHR_IMAGE_BASE;
+    property public static final String EGL_KHR_NO_CONFIG_CONTEXT;
+    property public static final String EGL_KHR_PARTIAL_UPDATE;
+    property public static final String EGL_KHR_SURFACELESS_CONTEXT;
+    property public static final String EGL_KHR_SWAP_BUFFERS_WITH_DAMAGE;
+    property public static final String EGL_KHR_WAIT_SYNC;
+    property public static final int EGL_SIGNALED_KHR;
+    property public static final int EGL_SYNC_CONDITION_KHR;
+    property public static final int EGL_SYNC_FENCE_KHR;
+    property public static final int EGL_SYNC_FLUSH_COMMANDS_BIT_KHR;
+    property public static final int EGL_SYNC_NATIVE_FENCE_ANDROID;
+    property public static final int EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR;
+    property public static final int EGL_SYNC_STATUS_KHR;
+    property public static final int EGL_SYNC_TYPE_KHR;
+    property public static final int EGL_TIMEOUT_EXPIRED_KHR;
+    property public static final int EGL_TRUE;
+    property public static final int EGL_UNSIGNALED_KHR;
   }
 
   public interface EGLHandle {
diff --git a/graphics/graphics-core/api/restricted_current.txt b/graphics/graphics-core/api/restricted_current.txt
index 30c959d..7ae02f2 100644
--- a/graphics/graphics-core/api/restricted_current.txt
+++ b/graphics/graphics-core/api/restricted_current.txt
@@ -49,6 +49,8 @@
   }
 
   public static final class CanvasBufferedRenderer.RenderResult.Companion {
+    property public static final int ERROR_UNKNOWN;
+    property public static final int SUCCESS;
   }
 
 }
@@ -253,6 +255,7 @@
   }
 
   public static final class SyncStrategy.Companion {
+    property public androidx.graphics.opengl.SyncStrategy ALWAYS;
   }
 
 }
@@ -280,6 +283,12 @@
   }
 
   public static final class EGLConfigAttributes.Companion {
+    property public static final int EGL_COLOR_COMPONENT_TYPE_EXT;
+    property public static final int EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
+    property public static final int EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_1010102;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_8888;
+    property public final androidx.graphics.opengl.egl.EGLConfigAttributes RGBA_F16;
   }
 
   public final class EGLConfigAttributesKt {
@@ -355,6 +364,7 @@
 
   public static final class EGLSpec.Companion {
     method public String getStatusString(int error);
+    property public androidx.graphics.opengl.egl.EGLSpec V14;
   }
 
   public final class EGLVersion {
@@ -373,6 +383,9 @@
   }
 
   public static final class EGLVersion.Companion {
+    property public final androidx.graphics.opengl.egl.EGLVersion Unknown;
+    property public final androidx.graphics.opengl.egl.EGLVersion V14;
+    property public final androidx.graphics.opengl.egl.EGLVersion V15;
   }
 
 }
@@ -404,6 +417,16 @@
   }
 
   public static final class SurfaceControlCompat.Companion {
+    property public static final int BUFFER_TRANSFORM_IDENTITY;
+    property public static final int BUFFER_TRANSFORM_MIRROR_HORIZONTAL;
+    property public static final int BUFFER_TRANSFORM_MIRROR_VERTICAL;
+    property public static final int BUFFER_TRANSFORM_ROTATE_180;
+    property public static final int BUFFER_TRANSFORM_ROTATE_270;
+    property public static final int BUFFER_TRANSFORM_ROTATE_90;
+    property public static final int CHANGE_FRAME_RATE_ALWAYS;
+    property public static final int CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS;
+    property public static final int FRAME_RATE_COMPATIBILITY_DEFAULT;
+    property public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.Q) public static final class SurfaceControlCompat.Transaction implements java.lang.AutoCloseable {
@@ -468,6 +491,29 @@
   }
 
   public static final class DataSpace.Companion {
+    property public static final int DATASPACE_ADOBE_RGB;
+    property public static final int DATASPACE_BT2020;
+    property public static final int DATASPACE_BT2020_HLG;
+    property public static final int DATASPACE_BT2020_PQ;
+    property public static final int DATASPACE_BT601_525;
+    property public static final int DATASPACE_BT601_625;
+    property public static final int DATASPACE_BT709;
+    property public static final int DATASPACE_DCI_P3;
+    property public static final int DATASPACE_DEPTH;
+    property public static final int DATASPACE_DISPLAY_P3;
+    property public static final int DATASPACE_DYNAMIC_DEPTH;
+    property public static final int DATASPACE_HEIF;
+    property public static final int DATASPACE_JFIF;
+    property public static final int DATASPACE_JPEG_R;
+    property public static final int DATASPACE_SCRGB;
+    property public static final int DATASPACE_SCRGB_LINEAR;
+    property public static final int DATASPACE_SRGB;
+    property public static final int DATASPACE_SRGB_LINEAR;
+    property public static final int DATASPACE_UNKNOWN;
+    property public static final int RANGE_EXTENDED;
+    property public static final int RANGE_FULL;
+    property public static final int RANGE_LIMITED;
+    property public static final int RANGE_UNSPECIFIED;
   }
 
   public final class SyncFenceCompat implements java.lang.AutoCloseable {
@@ -484,6 +530,8 @@
 
   public static final class SyncFenceCompat.Companion {
     method public androidx.hardware.SyncFenceCompat createNativeSyncFence();
+    property public static final long SIGNAL_TIME_INVALID;
+    property public static final long SIGNAL_TIME_PENDING;
   }
 
 }
@@ -543,6 +591,38 @@
     method public boolean eglGetSyncAttribKHR(android.opengl.EGLDisplay eglDisplay, androidx.opengl.EGLSyncKHR sync, int attribute, int[] value, int offset);
     method public void glEGLImageTargetTexture2DOES(int target, androidx.opengl.EGLImageKHR image);
     method public java.util.Set<java.lang.String> parseExtensions(String queryString);
+    property public static final String EGL_ANDROID_CLIENT_BUFFER;
+    property public static final String EGL_ANDROID_IMAGE_NATIVE_BUFFER;
+    property public static final String EGL_ANDROID_NATIVE_FENCE_SYNC;
+    property public static final int EGL_CONDITION_SATISFIED_KHR;
+    property public static final String EGL_EXT_BUFFER_AGE;
+    property public static final String EGL_EXT_GL_COLORSPACE_BT2020_PQ;
+    property public static final String EGL_EXT_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH;
+    property public static final String EGL_EXT_GL_COLORSPACE_SCRGB;
+    property public static final String EGL_EXT_PIXEL_FORMAT_FLOAT;
+    property public static final int EGL_FALSE;
+    property public static final long EGL_FOREVER_KHR;
+    property public static final String EGL_IMG_CONTEXT_PRIORITY;
+    property public static final String EGL_KHR_FENCE_SYNC;
+    property public static final String EGL_KHR_GL_COLORSPACE;
+    property public static final String EGL_KHR_IMAGE;
+    property public static final String EGL_KHR_IMAGE_BASE;
+    property public static final String EGL_KHR_NO_CONFIG_CONTEXT;
+    property public static final String EGL_KHR_PARTIAL_UPDATE;
+    property public static final String EGL_KHR_SURFACELESS_CONTEXT;
+    property public static final String EGL_KHR_SWAP_BUFFERS_WITH_DAMAGE;
+    property public static final String EGL_KHR_WAIT_SYNC;
+    property public static final int EGL_SIGNALED_KHR;
+    property public static final int EGL_SYNC_CONDITION_KHR;
+    property public static final int EGL_SYNC_FENCE_KHR;
+    property public static final int EGL_SYNC_FLUSH_COMMANDS_BIT_KHR;
+    property public static final int EGL_SYNC_NATIVE_FENCE_ANDROID;
+    property public static final int EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR;
+    property public static final int EGL_SYNC_STATUS_KHR;
+    property public static final int EGL_SYNC_TYPE_KHR;
+    property public static final int EGL_TIMEOUT_EXPIRED_KHR;
+    property public static final int EGL_TRUE;
+    property public static final int EGL_UNSIGNALED_KHR;
   }
 
   public interface EGLHandle {
diff --git a/graphics/graphics-shapes/api/current.txt b/graphics/graphics-shapes/api/current.txt
index 635a1c7..ffb2a79 100644
--- a/graphics/graphics-shapes/api/current.txt
+++ b/graphics/graphics-shapes/api/current.txt
@@ -13,6 +13,7 @@
   }
 
   public static final class CornerRounding.Companion {
+    property public final androidx.graphics.shapes.CornerRounding Unrounded;
   }
 
   public class Cubic {
diff --git a/graphics/graphics-shapes/api/restricted_current.txt b/graphics/graphics-shapes/api/restricted_current.txt
index 99442ee..d06875e 100644
--- a/graphics/graphics-shapes/api/restricted_current.txt
+++ b/graphics/graphics-shapes/api/restricted_current.txt
@@ -13,6 +13,7 @@
   }
 
   public static final class CornerRounding.Companion {
+    property public final androidx.graphics.shapes.CornerRounding Unrounded;
   }
 
   public class Cubic {
diff --git a/health/connect/connect-client/api/current.txt b/health/connect/connect-client/api/current.txt
index 264e693..dbf1a43 100644
--- a/health/connect/connect-client/api/current.txt
+++ b/health/connect/connect-client/api/current.txt
@@ -39,6 +39,9 @@
     method public int getSdkStatus(android.content.Context context);
     method public int getSdkStatus(android.content.Context context, optional String providerPackageName);
     property public final String ACTION_HEALTH_CONNECT_SETTINGS;
+    property public static final int SDK_AVAILABLE;
+    property public static final int SDK_UNAVAILABLE;
+    property public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED;
     field public static final int SDK_AVAILABLE = 3; // 0x3
     field public static final int SDK_UNAVAILABLE = 1; // 0x1
     field public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED = 2; // 0x2
@@ -62,6 +65,12 @@
   }
 
   public static final class HealthConnectFeatures.Companion {
+    property public static final int FEATURE_PLANNED_EXERCISE;
+    property public static final int FEATURE_READ_HEALTH_DATA_HISTORY;
+    property public static final int FEATURE_READ_HEALTH_DATA_IN_BACKGROUND;
+    property public static final int FEATURE_SKIN_TEMPERATURE;
+    property public static final int FEATURE_STATUS_AVAILABLE;
+    property public static final int FEATURE_STATUS_UNAVAILABLE;
     field public static final int FEATURE_PLANNED_EXERCISE = 3; // 0x3
     field public static final int FEATURE_READ_HEALTH_DATA_HISTORY = 4; // 0x4
     field public static final int FEATURE_READ_HEALTH_DATA_IN_BACKGROUND = 1; // 0x1
@@ -174,6 +183,9 @@
   public static final class HealthPermission.Companion {
     method public String getReadPermission(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType);
     method public String getWritePermission(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType);
+    property public static final String PERMISSION_READ_HEALTH_DATA_HISTORY;
+    property public static final String PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND;
+    property public static final String PERMISSION_WRITE_EXERCISE_ROUTE;
   }
 
 }
@@ -199,6 +211,7 @@
   }
 
   public static final class ActiveCaloriesBurnedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ACTIVE_CALORIES_TOTAL;
   }
 
   public final class BasalBodyTemperatureRecord implements androidx.health.connect.client.records.Record {
@@ -230,6 +243,7 @@
   }
 
   public static final class BasalMetabolicRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> BASAL_CALORIES_TOTAL;
   }
 
   public final class BloodGlucoseRecord implements androidx.health.connect.client.records.Record {
@@ -264,6 +278,18 @@
   }
 
   public static final class BloodGlucoseRecord.Companion {
+    property public static final int RELATION_TO_MEAL_AFTER_MEAL;
+    property public static final int RELATION_TO_MEAL_BEFORE_MEAL;
+    property public static final int RELATION_TO_MEAL_FASTING;
+    property public static final int RELATION_TO_MEAL_GENERAL;
+    property public static final int RELATION_TO_MEAL_UNKNOWN;
+    property public static final int SPECIMEN_SOURCE_CAPILLARY_BLOOD;
+    property public static final int SPECIMEN_SOURCE_INTERSTITIAL_FLUID;
+    property public static final int SPECIMEN_SOURCE_PLASMA;
+    property public static final int SPECIMEN_SOURCE_SERUM;
+    property public static final int SPECIMEN_SOURCE_TEARS;
+    property public static final int SPECIMEN_SOURCE_UNKNOWN;
+    property public static final int SPECIMEN_SOURCE_WHOLE_BLOOD;
   }
 
   public final class BloodPressureRecord implements androidx.health.connect.client.records.Record {
@@ -302,6 +328,22 @@
   }
 
   public static final class BloodPressureRecord.Companion {
+    property public static final int BODY_POSITION_LYING_DOWN;
+    property public static final int BODY_POSITION_RECLINING;
+    property public static final int BODY_POSITION_SITTING_DOWN;
+    property public static final int BODY_POSITION_STANDING_UP;
+    property public static final int BODY_POSITION_UNKNOWN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_MIN;
+    property public static final int MEASUREMENT_LOCATION_LEFT_UPPER_ARM;
+    property public static final int MEASUREMENT_LOCATION_LEFT_WRIST;
+    property public static final int MEASUREMENT_LOCATION_RIGHT_UPPER_ARM;
+    property public static final int MEASUREMENT_LOCATION_RIGHT_WRIST;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_MIN;
   }
 
   public final class BodyFatRecord implements androidx.health.connect.client.records.Record {
@@ -317,6 +359,17 @@
   }
 
   public final class BodyTemperatureMeasurementLocation {
+    property public static final int MEASUREMENT_LOCATION_ARMPIT;
+    property public static final int MEASUREMENT_LOCATION_EAR;
+    property public static final int MEASUREMENT_LOCATION_FINGER;
+    property public static final int MEASUREMENT_LOCATION_FOREHEAD;
+    property public static final int MEASUREMENT_LOCATION_MOUTH;
+    property public static final int MEASUREMENT_LOCATION_RECTUM;
+    property public static final int MEASUREMENT_LOCATION_TEMPORAL_ARTERY;
+    property public static final int MEASUREMENT_LOCATION_TOE;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public static final int MEASUREMENT_LOCATION_VAGINA;
+    property public static final int MEASUREMENT_LOCATION_WRIST;
     field public static final androidx.health.connect.client.records.BodyTemperatureMeasurementLocation INSTANCE;
     field public static final int MEASUREMENT_LOCATION_ARMPIT = 1; // 0x1
     field public static final int MEASUREMENT_LOCATION_EAR = 8; // 0x8
@@ -396,6 +449,17 @@
   }
 
   public static final class CervicalMucusRecord.Companion {
+    property public static final int APPEARANCE_CREAMY;
+    property public static final int APPEARANCE_DRY;
+    property public static final int APPEARANCE_EGG_WHITE;
+    property public static final int APPEARANCE_STICKY;
+    property public static final int APPEARANCE_UNKNOWN;
+    property public static final int APPEARANCE_UNUSUAL;
+    property public static final int APPEARANCE_WATERY;
+    property public static final int SENSATION_HEAVY;
+    property public static final int SENSATION_LIGHT;
+    property public static final int SENSATION_MEDIUM;
+    property public static final int SENSATION_UNKNOWN;
   }
 
   public final class CyclingPedalingCadenceRecord implements androidx.health.connect.client.records.Record {
@@ -419,6 +483,9 @@
   }
 
   public static final class CyclingPedalingCadenceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_MIN;
   }
 
   public static final class CyclingPedalingCadenceRecord.Sample {
@@ -448,6 +515,7 @@
   }
 
   public static final class DistanceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> DISTANCE_TOTAL;
   }
 
   public final class ElevationGainedRecord implements androidx.health.connect.client.records.Record {
@@ -469,6 +537,7 @@
   }
 
   public static final class ElevationGainedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> ELEVATION_GAINED_TOTAL;
   }
 
   public abstract class ExerciseCompletionGoal {
@@ -716,6 +785,74 @@
   }
 
   public static final class ExerciseSegment.Companion {
+    property public static final int EXERCISE_SEGMENT_TYPE_ARM_CURL;
+    property public static final int EXERCISE_SEGMENT_TYPE_BACK_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_BALL_SLAM;
+    property public static final int EXERCISE_SEGMENT_TYPE_BARBELL_SHOULDER_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_BENCH_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_BENCH_SIT_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_BIKING;
+    property public static final int EXERCISE_SEGMENT_TYPE_BIKING_STATIONARY;
+    property public static final int EXERCISE_SEGMENT_TYPE_BURPEE;
+    property public static final int EXERCISE_SEGMENT_TYPE_CRUNCH;
+    property public static final int EXERCISE_SEGMENT_TYPE_DEADLIFT;
+    property public static final int EXERCISE_SEGMENT_TYPE_DOUBLE_ARM_TRICEPS_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_CURL_LEFT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_CURL_RIGHT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_FRONT_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_LATERAL_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_ROW;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_ELLIPTICAL;
+    property public static final int EXERCISE_SEGMENT_TYPE_FORWARD_TWIST;
+    property public static final int EXERCISE_SEGMENT_TYPE_FRONT_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public static final int EXERCISE_SEGMENT_TYPE_HIP_THRUST;
+    property public static final int EXERCISE_SEGMENT_TYPE_HULA_HOOP;
+    property public static final int EXERCISE_SEGMENT_TYPE_JUMPING_JACK;
+    property public static final int EXERCISE_SEGMENT_TYPE_JUMP_ROPE;
+    property public static final int EXERCISE_SEGMENT_TYPE_KETTLEBELL_SWING;
+    property public static final int EXERCISE_SEGMENT_TYPE_LATERAL_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_LAT_PULL_DOWN;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_CURL;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_LUNGE;
+    property public static final int EXERCISE_SEGMENT_TYPE_MOUNTAIN_CLIMBER;
+    property public static final int EXERCISE_SEGMENT_TYPE_OTHER_WORKOUT;
+    property public static final int EXERCISE_SEGMENT_TYPE_PAUSE;
+    property public static final int EXERCISE_SEGMENT_TYPE_PILATES;
+    property public static final int EXERCISE_SEGMENT_TYPE_PLANK;
+    property public static final int EXERCISE_SEGMENT_TYPE_PULL_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_PUNCH;
+    property public static final int EXERCISE_SEGMENT_TYPE_REST;
+    property public static final int EXERCISE_SEGMENT_TYPE_ROWING_MACHINE;
+    property public static final int EXERCISE_SEGMENT_TYPE_RUNNING;
+    property public static final int EXERCISE_SEGMENT_TYPE_RUNNING_TREADMILL;
+    property public static final int EXERCISE_SEGMENT_TYPE_SHOULDER_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_SINGLE_ARM_TRICEPS_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_SIT_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_SQUAT;
+    property public static final int EXERCISE_SEGMENT_TYPE_STAIR_CLIMBING;
+    property public static final int EXERCISE_SEGMENT_TYPE_STAIR_CLIMBING_MACHINE;
+    property public static final int EXERCISE_SEGMENT_TYPE_STRETCHING;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BACKSTROKE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BREASTSTROKE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BUTTERFLY;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_FREESTYLE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_MIXED;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_OPEN_WATER;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_OTHER;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_POOL;
+    property public static final int EXERCISE_SEGMENT_TYPE_UNKNOWN;
+    property public static final int EXERCISE_SEGMENT_TYPE_UPPER_TWIST;
+    property public static final int EXERCISE_SEGMENT_TYPE_WALKING;
+    property public static final int EXERCISE_SEGMENT_TYPE_WEIGHTLIFTING;
+    property public static final int EXERCISE_SEGMENT_TYPE_WHEELCHAIR;
+    property public static final int EXERCISE_SEGMENT_TYPE_YOGA;
   }
 
   public final class ExerciseSessionRecord implements androidx.health.connect.client.records.Record {
@@ -817,6 +954,68 @@
   }
 
   public static final class ExerciseSessionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.time.Duration> EXERCISE_DURATION_TOTAL;
+    property public static final int EXERCISE_TYPE_BADMINTON;
+    property public static final int EXERCISE_TYPE_BASEBALL;
+    property public static final int EXERCISE_TYPE_BASKETBALL;
+    property public static final int EXERCISE_TYPE_BIKING;
+    property public static final int EXERCISE_TYPE_BIKING_STATIONARY;
+    property public static final int EXERCISE_TYPE_BOOT_CAMP;
+    property public static final int EXERCISE_TYPE_BOXING;
+    property public static final int EXERCISE_TYPE_CALISTHENICS;
+    property public static final int EXERCISE_TYPE_CRICKET;
+    property public static final int EXERCISE_TYPE_DANCING;
+    property public static final int EXERCISE_TYPE_ELLIPTICAL;
+    property public static final int EXERCISE_TYPE_EXERCISE_CLASS;
+    property public static final int EXERCISE_TYPE_FENCING;
+    property public static final int EXERCISE_TYPE_FOOTBALL_AMERICAN;
+    property public static final int EXERCISE_TYPE_FOOTBALL_AUSTRALIAN;
+    property public static final int EXERCISE_TYPE_FRISBEE_DISC;
+    property public static final int EXERCISE_TYPE_GOLF;
+    property public static final int EXERCISE_TYPE_GUIDED_BREATHING;
+    property public static final int EXERCISE_TYPE_GYMNASTICS;
+    property public static final int EXERCISE_TYPE_HANDBALL;
+    property public static final int EXERCISE_TYPE_HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public static final int EXERCISE_TYPE_HIKING;
+    property public static final int EXERCISE_TYPE_ICE_HOCKEY;
+    property public static final int EXERCISE_TYPE_ICE_SKATING;
+    property public static final int EXERCISE_TYPE_MARTIAL_ARTS;
+    property public static final int EXERCISE_TYPE_OTHER_WORKOUT;
+    property public static final int EXERCISE_TYPE_PADDLING;
+    property public static final int EXERCISE_TYPE_PARAGLIDING;
+    property public static final int EXERCISE_TYPE_PILATES;
+    property public static final int EXERCISE_TYPE_RACQUETBALL;
+    property public static final int EXERCISE_TYPE_ROCK_CLIMBING;
+    property public static final int EXERCISE_TYPE_ROLLER_HOCKEY;
+    property public static final int EXERCISE_TYPE_ROWING;
+    property public static final int EXERCISE_TYPE_ROWING_MACHINE;
+    property public static final int EXERCISE_TYPE_RUGBY;
+    property public static final int EXERCISE_TYPE_RUNNING;
+    property public static final int EXERCISE_TYPE_RUNNING_TREADMILL;
+    property public static final int EXERCISE_TYPE_SAILING;
+    property public static final int EXERCISE_TYPE_SCUBA_DIVING;
+    property public static final int EXERCISE_TYPE_SKATING;
+    property public static final int EXERCISE_TYPE_SKIING;
+    property public static final int EXERCISE_TYPE_SNOWBOARDING;
+    property public static final int EXERCISE_TYPE_SNOWSHOEING;
+    property public static final int EXERCISE_TYPE_SOCCER;
+    property public static final int EXERCISE_TYPE_SOFTBALL;
+    property public static final int EXERCISE_TYPE_SQUASH;
+    property public static final int EXERCISE_TYPE_STAIR_CLIMBING;
+    property public static final int EXERCISE_TYPE_STAIR_CLIMBING_MACHINE;
+    property public static final int EXERCISE_TYPE_STRENGTH_TRAINING;
+    property public static final int EXERCISE_TYPE_STRETCHING;
+    property public static final int EXERCISE_TYPE_SURFING;
+    property public static final int EXERCISE_TYPE_SWIMMING_OPEN_WATER;
+    property public static final int EXERCISE_TYPE_SWIMMING_POOL;
+    property public static final int EXERCISE_TYPE_TABLE_TENNIS;
+    property public static final int EXERCISE_TYPE_TENNIS;
+    property public static final int EXERCISE_TYPE_VOLLEYBALL;
+    property public static final int EXERCISE_TYPE_WALKING;
+    property public static final int EXERCISE_TYPE_WATER_POLO;
+    property public static final int EXERCISE_TYPE_WEIGHTLIFTING;
+    property public static final int EXERCISE_TYPE_WHEELCHAIR;
+    property public static final int EXERCISE_TYPE_YOGA;
   }
 
   public final class FloorsClimbedRecord implements androidx.health.connect.client.records.Record {
@@ -838,6 +1037,7 @@
   }
 
   public static final class FloorsClimbedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> FLOORS_CLIMBED_TOTAL;
   }
 
   public final class HeartRateRecord implements androidx.health.connect.client.records.Record {
@@ -862,6 +1062,10 @@
   }
 
   public static final class HeartRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MIN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> MEASUREMENTS_COUNT;
   }
 
   public static final class HeartRateRecord.Sample {
@@ -901,6 +1105,9 @@
   }
 
   public static final class HeightRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_MIN;
   }
 
   public final class HydrationRecord implements androidx.health.connect.client.records.Record {
@@ -922,6 +1129,7 @@
   }
 
   public static final class HydrationRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Volume> VOLUME_TOTAL;
   }
 
   public final class IntermenstrualBleedingRecord implements androidx.health.connect.client.records.Record {
@@ -947,6 +1155,11 @@
   }
 
   public final class MealType {
+    property public static final int MEAL_TYPE_BREAKFAST;
+    property public static final int MEAL_TYPE_DINNER;
+    property public static final int MEAL_TYPE_LUNCH;
+    property public static final int MEAL_TYPE_SNACK;
+    property public static final int MEAL_TYPE_UNKNOWN;
     field public static final androidx.health.connect.client.records.MealType INSTANCE;
     field public static final int MEAL_TYPE_BREAKFAST = 1; // 0x1
     field public static final int MEAL_TYPE_DINNER = 3; // 0x3
@@ -973,6 +1186,10 @@
   }
 
   public static final class MenstruationFlowRecord.Companion {
+    property public static final int FLOW_HEAVY;
+    property public static final int FLOW_LIGHT;
+    property public static final int FLOW_MEDIUM;
+    property public static final int FLOW_UNKNOWN;
   }
 
   public final class MenstruationPeriodRecord implements androidx.health.connect.client.records.Record {
@@ -1135,6 +1352,48 @@
   }
 
   public static final class NutritionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> BIOTIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CAFFEINE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CALCIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHLORIDE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHOLESTEROL_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHROMIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> COPPER_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> DIETARY_FIBER_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_FROM_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> FOLATE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> FOLIC_ACID_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> IODINE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> IRON_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MAGNESIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MANGANESE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MOLYBDENUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MONOUNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> NIACIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PANTOTHENIC_ACID_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PHOSPHORUS_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> POLYUNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> POTASSIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PROTEIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> RIBOFLAVIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SELENIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SODIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SUGAR_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> THIAMIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TOTAL_CARBOHYDRATE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TOTAL_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TRANS_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> UNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_A_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_B12_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_B6_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_C_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_D_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_E_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_K_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> ZINC_TOTAL;
   }
 
   public final class OvulationTestRecord implements androidx.health.connect.client.records.Record {
@@ -1155,6 +1414,10 @@
   }
 
   public static final class OvulationTestRecord.Companion {
+    property public static final int RESULT_HIGH;
+    property public static final int RESULT_INCONCLUSIVE;
+    property public static final int RESULT_NEGATIVE;
+    property public static final int RESULT_POSITIVE;
   }
 
   public final class OxygenSaturationRecord implements androidx.health.connect.client.records.Record {
@@ -1238,6 +1501,12 @@
   }
 
   public static final class PlannedExerciseStep.Companion {
+    property public static final int EXERCISE_PHASE_ACTIVE;
+    property public static final int EXERCISE_PHASE_COOLDOWN;
+    property public static final int EXERCISE_PHASE_RECOVERY;
+    property public static final int EXERCISE_PHASE_REST;
+    property public static final int EXERCISE_PHASE_UNKNOWN;
+    property public static final int EXERCISE_PHASE_WARMUP;
   }
 
   public final class PowerRecord implements androidx.health.connect.client.records.Record {
@@ -1261,6 +1530,9 @@
   }
 
   public static final class PowerRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_MIN;
   }
 
   public static final class PowerRecord.Sample {
@@ -1305,6 +1577,9 @@
   }
 
   public static final class RestingHeartRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MIN;
   }
 
   public final class SexualActivityRecord implements androidx.health.connect.client.records.Record {
@@ -1324,6 +1599,9 @@
   }
 
   public static final class SexualActivityRecord.Companion {
+    property public static final int PROTECTION_USED_PROTECTED;
+    property public static final int PROTECTION_USED_UNKNOWN;
+    property public static final int PROTECTION_USED_UNPROTECTED;
   }
 
   public final class SkinTemperatureRecord implements androidx.health.connect.client.records.Record {
@@ -1355,6 +1633,13 @@
   }
 
   public static final class SkinTemperatureRecord.Companion {
+    property public static final int MEASUREMENT_LOCATION_FINGER;
+    property public static final int MEASUREMENT_LOCATION_TOE;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public static final int MEASUREMENT_LOCATION_WRIST;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_MIN;
   }
 
   public static final class SkinTemperatureRecord.Delta {
@@ -1396,6 +1681,15 @@
   }
 
   public static final class SleepSessionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.time.Duration> SLEEP_DURATION_TOTAL;
+    property public static final int STAGE_TYPE_AWAKE;
+    property public static final int STAGE_TYPE_AWAKE_IN_BED;
+    property public static final int STAGE_TYPE_DEEP;
+    property public static final int STAGE_TYPE_LIGHT;
+    property public static final int STAGE_TYPE_OUT_OF_BED;
+    property public static final int STAGE_TYPE_REM;
+    property public static final int STAGE_TYPE_SLEEPING;
+    property public static final int STAGE_TYPE_UNKNOWN;
   }
 
   public static final class SleepSessionRecord.Stage {
@@ -1429,6 +1723,9 @@
   }
 
   public static final class SpeedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_MIN;
   }
 
   public static final class SpeedRecord.Sample {
@@ -1460,6 +1757,9 @@
   }
 
   public static final class StepsCadenceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_MIN;
   }
 
   public static final class StepsCadenceRecord.Sample {
@@ -1489,6 +1789,7 @@
   }
 
   public static final class StepsRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> COUNT_TOTAL;
   }
 
   public final class TotalCaloriesBurnedRecord implements androidx.health.connect.client.records.Record {
@@ -1510,6 +1811,7 @@
   }
 
   public static final class TotalCaloriesBurnedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_TOTAL;
   }
 
   public final class Vo2MaxRecord implements androidx.health.connect.client.records.Record {
@@ -1534,6 +1836,12 @@
   }
 
   public static final class Vo2MaxRecord.Companion {
+    property public static final int MEASUREMENT_METHOD_COOPER_TEST;
+    property public static final int MEASUREMENT_METHOD_HEART_RATE_RATIO;
+    property public static final int MEASUREMENT_METHOD_METABOLIC_CART;
+    property public static final int MEASUREMENT_METHOD_MULTISTAGE_FITNESS_TEST;
+    property public static final int MEASUREMENT_METHOD_OTHER;
+    property public static final int MEASUREMENT_METHOD_ROCKPORT_FITNESS_TEST;
   }
 
   public final class WeightRecord implements androidx.health.connect.client.records.Record {
@@ -1553,6 +1861,9 @@
   }
 
   public static final class WeightRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_MIN;
   }
 
   public final class WheelchairPushesRecord implements androidx.health.connect.client.records.Record {
@@ -1574,6 +1885,7 @@
   }
 
   public static final class WheelchairPushesRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> COUNT_TOTAL;
   }
 
 }
@@ -1608,6 +1920,15 @@
   }
 
   public static final class Device.Companion {
+    property public static final int TYPE_CHEST_STRAP;
+    property public static final int TYPE_FITNESS_BAND;
+    property public static final int TYPE_HEAD_MOUNTED;
+    property public static final int TYPE_PHONE;
+    property public static final int TYPE_RING;
+    property public static final int TYPE_SCALE;
+    property public static final int TYPE_SMART_DISPLAY;
+    property public static final int TYPE_UNKNOWN;
+    property public static final int TYPE_WATCH;
   }
 
   public final class Metadata {
@@ -1635,6 +1956,10 @@
   }
 
   public static final class Metadata.Companion {
+    property public static final int RECORDING_METHOD_ACTIVELY_RECORDED;
+    property public static final int RECORDING_METHOD_AUTOMATICALLY_RECORDED;
+    property public static final int RECORDING_METHOD_MANUAL_ENTRY;
+    property public static final int RECORDING_METHOD_UNKNOWN;
   }
 
 }
diff --git a/health/connect/connect-client/api/restricted_current.txt b/health/connect/connect-client/api/restricted_current.txt
index 13c63b6..358bd7b 100644
--- a/health/connect/connect-client/api/restricted_current.txt
+++ b/health/connect/connect-client/api/restricted_current.txt
@@ -39,6 +39,9 @@
     method public int getSdkStatus(android.content.Context context);
     method public int getSdkStatus(android.content.Context context, optional String providerPackageName);
     property public final String ACTION_HEALTH_CONNECT_SETTINGS;
+    property public static final int SDK_AVAILABLE;
+    property public static final int SDK_UNAVAILABLE;
+    property public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED;
     field public static final int SDK_AVAILABLE = 3; // 0x3
     field public static final int SDK_UNAVAILABLE = 1; // 0x1
     field public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED = 2; // 0x2
@@ -62,6 +65,12 @@
   }
 
   public static final class HealthConnectFeatures.Companion {
+    property public static final int FEATURE_PLANNED_EXERCISE;
+    property public static final int FEATURE_READ_HEALTH_DATA_HISTORY;
+    property public static final int FEATURE_READ_HEALTH_DATA_IN_BACKGROUND;
+    property public static final int FEATURE_SKIN_TEMPERATURE;
+    property public static final int FEATURE_STATUS_AVAILABLE;
+    property public static final int FEATURE_STATUS_UNAVAILABLE;
     field public static final int FEATURE_PLANNED_EXERCISE = 3; // 0x3
     field public static final int FEATURE_READ_HEALTH_DATA_HISTORY = 4; // 0x4
     field public static final int FEATURE_READ_HEALTH_DATA_IN_BACKGROUND = 1; // 0x1
@@ -174,6 +183,9 @@
   public static final class HealthPermission.Companion {
     method public String getReadPermission(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType);
     method public String getWritePermission(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType);
+    property public static final String PERMISSION_READ_HEALTH_DATA_HISTORY;
+    property public static final String PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND;
+    property public static final String PERMISSION_WRITE_EXERCISE_ROUTE;
   }
 
 }
@@ -199,6 +211,7 @@
   }
 
   public static final class ActiveCaloriesBurnedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ACTIVE_CALORIES_TOTAL;
   }
 
   public final class BasalBodyTemperatureRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -230,6 +243,7 @@
   }
 
   public static final class BasalMetabolicRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> BASAL_CALORIES_TOTAL;
   }
 
   public final class BloodGlucoseRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -264,6 +278,18 @@
   }
 
   public static final class BloodGlucoseRecord.Companion {
+    property public static final int RELATION_TO_MEAL_AFTER_MEAL;
+    property public static final int RELATION_TO_MEAL_BEFORE_MEAL;
+    property public static final int RELATION_TO_MEAL_FASTING;
+    property public static final int RELATION_TO_MEAL_GENERAL;
+    property public static final int RELATION_TO_MEAL_UNKNOWN;
+    property public static final int SPECIMEN_SOURCE_CAPILLARY_BLOOD;
+    property public static final int SPECIMEN_SOURCE_INTERSTITIAL_FLUID;
+    property public static final int SPECIMEN_SOURCE_PLASMA;
+    property public static final int SPECIMEN_SOURCE_SERUM;
+    property public static final int SPECIMEN_SOURCE_TEARS;
+    property public static final int SPECIMEN_SOURCE_UNKNOWN;
+    property public static final int SPECIMEN_SOURCE_WHOLE_BLOOD;
   }
 
   public final class BloodPressureRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -302,6 +328,22 @@
   }
 
   public static final class BloodPressureRecord.Companion {
+    property public static final int BODY_POSITION_LYING_DOWN;
+    property public static final int BODY_POSITION_RECLINING;
+    property public static final int BODY_POSITION_SITTING_DOWN;
+    property public static final int BODY_POSITION_STANDING_UP;
+    property public static final int BODY_POSITION_UNKNOWN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> DIASTOLIC_MIN;
+    property public static final int MEASUREMENT_LOCATION_LEFT_UPPER_ARM;
+    property public static final int MEASUREMENT_LOCATION_LEFT_WRIST;
+    property public static final int MEASUREMENT_LOCATION_RIGHT_UPPER_ARM;
+    property public static final int MEASUREMENT_LOCATION_RIGHT_WRIST;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Pressure> SYSTOLIC_MIN;
   }
 
   public final class BodyFatRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -317,6 +359,17 @@
   }
 
   public final class BodyTemperatureMeasurementLocation {
+    property public static final int MEASUREMENT_LOCATION_ARMPIT;
+    property public static final int MEASUREMENT_LOCATION_EAR;
+    property public static final int MEASUREMENT_LOCATION_FINGER;
+    property public static final int MEASUREMENT_LOCATION_FOREHEAD;
+    property public static final int MEASUREMENT_LOCATION_MOUTH;
+    property public static final int MEASUREMENT_LOCATION_RECTUM;
+    property public static final int MEASUREMENT_LOCATION_TEMPORAL_ARTERY;
+    property public static final int MEASUREMENT_LOCATION_TOE;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public static final int MEASUREMENT_LOCATION_VAGINA;
+    property public static final int MEASUREMENT_LOCATION_WRIST;
     field public static final androidx.health.connect.client.records.BodyTemperatureMeasurementLocation INSTANCE;
     field public static final int MEASUREMENT_LOCATION_ARMPIT = 1; // 0x1
     field public static final int MEASUREMENT_LOCATION_EAR = 8; // 0x8
@@ -396,6 +449,17 @@
   }
 
   public static final class CervicalMucusRecord.Companion {
+    property public static final int APPEARANCE_CREAMY;
+    property public static final int APPEARANCE_DRY;
+    property public static final int APPEARANCE_EGG_WHITE;
+    property public static final int APPEARANCE_STICKY;
+    property public static final int APPEARANCE_UNKNOWN;
+    property public static final int APPEARANCE_UNUSUAL;
+    property public static final int APPEARANCE_WATERY;
+    property public static final int SENSATION_HEAVY;
+    property public static final int SENSATION_LIGHT;
+    property public static final int SENSATION_MEDIUM;
+    property public static final int SENSATION_UNKNOWN;
   }
 
   public final class CyclingPedalingCadenceRecord implements androidx.health.connect.client.records.SeriesRecord<androidx.health.connect.client.records.CyclingPedalingCadenceRecord.Sample> {
@@ -419,6 +483,9 @@
   }
 
   public static final class CyclingPedalingCadenceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RPM_MIN;
   }
 
   public static final class CyclingPedalingCadenceRecord.Sample {
@@ -448,6 +515,7 @@
   }
 
   public static final class DistanceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> DISTANCE_TOTAL;
   }
 
   public final class ElevationGainedRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -469,6 +537,7 @@
   }
 
   public static final class ElevationGainedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> ELEVATION_GAINED_TOTAL;
   }
 
   public abstract class ExerciseCompletionGoal {
@@ -716,6 +785,74 @@
   }
 
   public static final class ExerciseSegment.Companion {
+    property public static final int EXERCISE_SEGMENT_TYPE_ARM_CURL;
+    property public static final int EXERCISE_SEGMENT_TYPE_BACK_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_BALL_SLAM;
+    property public static final int EXERCISE_SEGMENT_TYPE_BARBELL_SHOULDER_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_BENCH_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_BENCH_SIT_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_BIKING;
+    property public static final int EXERCISE_SEGMENT_TYPE_BIKING_STATIONARY;
+    property public static final int EXERCISE_SEGMENT_TYPE_BURPEE;
+    property public static final int EXERCISE_SEGMENT_TYPE_CRUNCH;
+    property public static final int EXERCISE_SEGMENT_TYPE_DEADLIFT;
+    property public static final int EXERCISE_SEGMENT_TYPE_DOUBLE_ARM_TRICEPS_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_CURL_LEFT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_CURL_RIGHT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_FRONT_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_LATERAL_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_ROW;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
+    property public static final int EXERCISE_SEGMENT_TYPE_ELLIPTICAL;
+    property public static final int EXERCISE_SEGMENT_TYPE_FORWARD_TWIST;
+    property public static final int EXERCISE_SEGMENT_TYPE_FRONT_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public static final int EXERCISE_SEGMENT_TYPE_HIP_THRUST;
+    property public static final int EXERCISE_SEGMENT_TYPE_HULA_HOOP;
+    property public static final int EXERCISE_SEGMENT_TYPE_JUMPING_JACK;
+    property public static final int EXERCISE_SEGMENT_TYPE_JUMP_ROPE;
+    property public static final int EXERCISE_SEGMENT_TYPE_KETTLEBELL_SWING;
+    property public static final int EXERCISE_SEGMENT_TYPE_LATERAL_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_LAT_PULL_DOWN;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_CURL;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_LEG_RAISE;
+    property public static final int EXERCISE_SEGMENT_TYPE_LUNGE;
+    property public static final int EXERCISE_SEGMENT_TYPE_MOUNTAIN_CLIMBER;
+    property public static final int EXERCISE_SEGMENT_TYPE_OTHER_WORKOUT;
+    property public static final int EXERCISE_SEGMENT_TYPE_PAUSE;
+    property public static final int EXERCISE_SEGMENT_TYPE_PILATES;
+    property public static final int EXERCISE_SEGMENT_TYPE_PLANK;
+    property public static final int EXERCISE_SEGMENT_TYPE_PULL_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_PUNCH;
+    property public static final int EXERCISE_SEGMENT_TYPE_REST;
+    property public static final int EXERCISE_SEGMENT_TYPE_ROWING_MACHINE;
+    property public static final int EXERCISE_SEGMENT_TYPE_RUNNING;
+    property public static final int EXERCISE_SEGMENT_TYPE_RUNNING_TREADMILL;
+    property public static final int EXERCISE_SEGMENT_TYPE_SHOULDER_PRESS;
+    property public static final int EXERCISE_SEGMENT_TYPE_SINGLE_ARM_TRICEPS_EXTENSION;
+    property public static final int EXERCISE_SEGMENT_TYPE_SIT_UP;
+    property public static final int EXERCISE_SEGMENT_TYPE_SQUAT;
+    property public static final int EXERCISE_SEGMENT_TYPE_STAIR_CLIMBING;
+    property public static final int EXERCISE_SEGMENT_TYPE_STAIR_CLIMBING_MACHINE;
+    property public static final int EXERCISE_SEGMENT_TYPE_STRETCHING;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BACKSTROKE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BREASTSTROKE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_BUTTERFLY;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_FREESTYLE;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_MIXED;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_OPEN_WATER;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_OTHER;
+    property public static final int EXERCISE_SEGMENT_TYPE_SWIMMING_POOL;
+    property public static final int EXERCISE_SEGMENT_TYPE_UNKNOWN;
+    property public static final int EXERCISE_SEGMENT_TYPE_UPPER_TWIST;
+    property public static final int EXERCISE_SEGMENT_TYPE_WALKING;
+    property public static final int EXERCISE_SEGMENT_TYPE_WEIGHTLIFTING;
+    property public static final int EXERCISE_SEGMENT_TYPE_WHEELCHAIR;
+    property public static final int EXERCISE_SEGMENT_TYPE_YOGA;
   }
 
   public final class ExerciseSessionRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -817,6 +954,68 @@
   }
 
   public static final class ExerciseSessionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.time.Duration> EXERCISE_DURATION_TOTAL;
+    property public static final int EXERCISE_TYPE_BADMINTON;
+    property public static final int EXERCISE_TYPE_BASEBALL;
+    property public static final int EXERCISE_TYPE_BASKETBALL;
+    property public static final int EXERCISE_TYPE_BIKING;
+    property public static final int EXERCISE_TYPE_BIKING_STATIONARY;
+    property public static final int EXERCISE_TYPE_BOOT_CAMP;
+    property public static final int EXERCISE_TYPE_BOXING;
+    property public static final int EXERCISE_TYPE_CALISTHENICS;
+    property public static final int EXERCISE_TYPE_CRICKET;
+    property public static final int EXERCISE_TYPE_DANCING;
+    property public static final int EXERCISE_TYPE_ELLIPTICAL;
+    property public static final int EXERCISE_TYPE_EXERCISE_CLASS;
+    property public static final int EXERCISE_TYPE_FENCING;
+    property public static final int EXERCISE_TYPE_FOOTBALL_AMERICAN;
+    property public static final int EXERCISE_TYPE_FOOTBALL_AUSTRALIAN;
+    property public static final int EXERCISE_TYPE_FRISBEE_DISC;
+    property public static final int EXERCISE_TYPE_GOLF;
+    property public static final int EXERCISE_TYPE_GUIDED_BREATHING;
+    property public static final int EXERCISE_TYPE_GYMNASTICS;
+    property public static final int EXERCISE_TYPE_HANDBALL;
+    property public static final int EXERCISE_TYPE_HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public static final int EXERCISE_TYPE_HIKING;
+    property public static final int EXERCISE_TYPE_ICE_HOCKEY;
+    property public static final int EXERCISE_TYPE_ICE_SKATING;
+    property public static final int EXERCISE_TYPE_MARTIAL_ARTS;
+    property public static final int EXERCISE_TYPE_OTHER_WORKOUT;
+    property public static final int EXERCISE_TYPE_PADDLING;
+    property public static final int EXERCISE_TYPE_PARAGLIDING;
+    property public static final int EXERCISE_TYPE_PILATES;
+    property public static final int EXERCISE_TYPE_RACQUETBALL;
+    property public static final int EXERCISE_TYPE_ROCK_CLIMBING;
+    property public static final int EXERCISE_TYPE_ROLLER_HOCKEY;
+    property public static final int EXERCISE_TYPE_ROWING;
+    property public static final int EXERCISE_TYPE_ROWING_MACHINE;
+    property public static final int EXERCISE_TYPE_RUGBY;
+    property public static final int EXERCISE_TYPE_RUNNING;
+    property public static final int EXERCISE_TYPE_RUNNING_TREADMILL;
+    property public static final int EXERCISE_TYPE_SAILING;
+    property public static final int EXERCISE_TYPE_SCUBA_DIVING;
+    property public static final int EXERCISE_TYPE_SKATING;
+    property public static final int EXERCISE_TYPE_SKIING;
+    property public static final int EXERCISE_TYPE_SNOWBOARDING;
+    property public static final int EXERCISE_TYPE_SNOWSHOEING;
+    property public static final int EXERCISE_TYPE_SOCCER;
+    property public static final int EXERCISE_TYPE_SOFTBALL;
+    property public static final int EXERCISE_TYPE_SQUASH;
+    property public static final int EXERCISE_TYPE_STAIR_CLIMBING;
+    property public static final int EXERCISE_TYPE_STAIR_CLIMBING_MACHINE;
+    property public static final int EXERCISE_TYPE_STRENGTH_TRAINING;
+    property public static final int EXERCISE_TYPE_STRETCHING;
+    property public static final int EXERCISE_TYPE_SURFING;
+    property public static final int EXERCISE_TYPE_SWIMMING_OPEN_WATER;
+    property public static final int EXERCISE_TYPE_SWIMMING_POOL;
+    property public static final int EXERCISE_TYPE_TABLE_TENNIS;
+    property public static final int EXERCISE_TYPE_TENNIS;
+    property public static final int EXERCISE_TYPE_VOLLEYBALL;
+    property public static final int EXERCISE_TYPE_WALKING;
+    property public static final int EXERCISE_TYPE_WATER_POLO;
+    property public static final int EXERCISE_TYPE_WEIGHTLIFTING;
+    property public static final int EXERCISE_TYPE_WHEELCHAIR;
+    property public static final int EXERCISE_TYPE_YOGA;
   }
 
   public final class FloorsClimbedRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -838,6 +1037,7 @@
   }
 
   public static final class FloorsClimbedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> FLOORS_CLIMBED_TOTAL;
   }
 
   public final class HeartRateRecord implements androidx.health.connect.client.records.SeriesRecord<androidx.health.connect.client.records.HeartRateRecord.Sample> {
@@ -862,6 +1062,10 @@
   }
 
   public static final class HeartRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MIN;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> MEASUREMENTS_COUNT;
   }
 
   public static final class HeartRateRecord.Sample {
@@ -901,6 +1105,9 @@
   }
 
   public static final class HeightRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Length> HEIGHT_MIN;
   }
 
   public final class HydrationRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -922,6 +1129,7 @@
   }
 
   public static final class HydrationRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Volume> VOLUME_TOTAL;
   }
 
   @kotlin.PublishedApi internal interface InstantaneousRecord extends androidx.health.connect.client.records.Record {
@@ -965,6 +1173,11 @@
   }
 
   public final class MealType {
+    property public static final int MEAL_TYPE_BREAKFAST;
+    property public static final int MEAL_TYPE_DINNER;
+    property public static final int MEAL_TYPE_LUNCH;
+    property public static final int MEAL_TYPE_SNACK;
+    property public static final int MEAL_TYPE_UNKNOWN;
     field public static final androidx.health.connect.client.records.MealType INSTANCE;
     field public static final int MEAL_TYPE_BREAKFAST = 1; // 0x1
     field public static final int MEAL_TYPE_DINNER = 3; // 0x3
@@ -991,6 +1204,10 @@
   }
 
   public static final class MenstruationFlowRecord.Companion {
+    property public static final int FLOW_HEAVY;
+    property public static final int FLOW_LIGHT;
+    property public static final int FLOW_MEDIUM;
+    property public static final int FLOW_UNKNOWN;
   }
 
   public final class MenstruationPeriodRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -1153,6 +1370,48 @@
   }
 
   public static final class NutritionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> BIOTIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CAFFEINE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CALCIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHLORIDE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHOLESTEROL_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> CHROMIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> COPPER_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> DIETARY_FIBER_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_FROM_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> FOLATE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> FOLIC_ACID_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> IODINE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> IRON_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MAGNESIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MANGANESE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MOLYBDENUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> MONOUNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> NIACIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PANTOTHENIC_ACID_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PHOSPHORUS_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> POLYUNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> POTASSIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> PROTEIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> RIBOFLAVIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SELENIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SODIUM_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> SUGAR_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> THIAMIN_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TOTAL_CARBOHYDRATE_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TOTAL_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> TRANS_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> UNSATURATED_FAT_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_A_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_B12_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_B6_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_C_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_D_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_E_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> VITAMIN_K_TOTAL;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> ZINC_TOTAL;
   }
 
   public final class OvulationTestRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -1173,6 +1432,10 @@
   }
 
   public static final class OvulationTestRecord.Companion {
+    property public static final int RESULT_HIGH;
+    property public static final int RESULT_INCONCLUSIVE;
+    property public static final int RESULT_NEGATIVE;
+    property public static final int RESULT_POSITIVE;
   }
 
   public final class OxygenSaturationRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -1256,6 +1519,12 @@
   }
 
   public static final class PlannedExerciseStep.Companion {
+    property public static final int EXERCISE_PHASE_ACTIVE;
+    property public static final int EXERCISE_PHASE_COOLDOWN;
+    property public static final int EXERCISE_PHASE_RECOVERY;
+    property public static final int EXERCISE_PHASE_REST;
+    property public static final int EXERCISE_PHASE_UNKNOWN;
+    property public static final int EXERCISE_PHASE_WARMUP;
   }
 
   public final class PowerRecord implements androidx.health.connect.client.records.SeriesRecord<androidx.health.connect.client.records.PowerRecord.Sample> {
@@ -1279,6 +1548,9 @@
   }
 
   public static final class PowerRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Power> POWER_MIN;
   }
 
   public static final class PowerRecord.Sample {
@@ -1323,6 +1595,9 @@
   }
 
   public static final class RestingHeartRateRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> BPM_MIN;
   }
 
   @kotlin.PublishedApi internal interface SeriesRecord<T> extends androidx.health.connect.client.records.IntervalRecord {
@@ -1347,6 +1622,9 @@
   }
 
   public static final class SexualActivityRecord.Companion {
+    property public static final int PROTECTION_USED_PROTECTED;
+    property public static final int PROTECTION_USED_UNKNOWN;
+    property public static final int PROTECTION_USED_UNPROTECTED;
   }
 
   public final class SkinTemperatureRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -1378,6 +1656,13 @@
   }
 
   public static final class SkinTemperatureRecord.Companion {
+    property public static final int MEASUREMENT_LOCATION_FINGER;
+    property public static final int MEASUREMENT_LOCATION_TOE;
+    property public static final int MEASUREMENT_LOCATION_UNKNOWN;
+    property public static final int MEASUREMENT_LOCATION_WRIST;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.TemperatureDelta> TEMPERATURE_DELTA_MIN;
   }
 
   public static final class SkinTemperatureRecord.Delta {
@@ -1419,6 +1704,15 @@
   }
 
   public static final class SleepSessionRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.time.Duration> SLEEP_DURATION_TOTAL;
+    property public static final int STAGE_TYPE_AWAKE;
+    property public static final int STAGE_TYPE_AWAKE_IN_BED;
+    property public static final int STAGE_TYPE_DEEP;
+    property public static final int STAGE_TYPE_LIGHT;
+    property public static final int STAGE_TYPE_OUT_OF_BED;
+    property public static final int STAGE_TYPE_REM;
+    property public static final int STAGE_TYPE_SLEEPING;
+    property public static final int STAGE_TYPE_UNKNOWN;
   }
 
   public static final class SleepSessionRecord.Stage {
@@ -1452,6 +1746,9 @@
   }
 
   public static final class SpeedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Velocity> SPEED_MIN;
   }
 
   public static final class SpeedRecord.Sample {
@@ -1483,6 +1780,9 @@
   }
 
   public static final class StepsCadenceRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Double> RATE_MIN;
   }
 
   public static final class StepsCadenceRecord.Sample {
@@ -1512,6 +1812,7 @@
   }
 
   public static final class StepsRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> COUNT_TOTAL;
   }
 
   public final class TotalCaloriesBurnedRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -1533,6 +1834,7 @@
   }
 
   public static final class TotalCaloriesBurnedRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Energy> ENERGY_TOTAL;
   }
 
   public final class Vo2MaxRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -1557,6 +1859,12 @@
   }
 
   public static final class Vo2MaxRecord.Companion {
+    property public static final int MEASUREMENT_METHOD_COOPER_TEST;
+    property public static final int MEASUREMENT_METHOD_HEART_RATE_RATIO;
+    property public static final int MEASUREMENT_METHOD_METABOLIC_CART;
+    property public static final int MEASUREMENT_METHOD_MULTISTAGE_FITNESS_TEST;
+    property public static final int MEASUREMENT_METHOD_OTHER;
+    property public static final int MEASUREMENT_METHOD_ROCKPORT_FITNESS_TEST;
   }
 
   public final class WeightRecord implements androidx.health.connect.client.records.InstantaneousRecord {
@@ -1576,6 +1884,9 @@
   }
 
   public static final class WeightRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_AVG;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_MAX;
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends androidx.health.connect.client.units.Mass> WEIGHT_MIN;
   }
 
   public final class WheelchairPushesRecord implements androidx.health.connect.client.records.IntervalRecord {
@@ -1597,6 +1908,7 @@
   }
 
   public static final class WheelchairPushesRecord.Companion {
+    property public final androidx.health.connect.client.aggregate.AggregateMetric<? extends java.lang.Long> COUNT_TOTAL;
   }
 
 }
@@ -1631,6 +1943,15 @@
   }
 
   public static final class Device.Companion {
+    property public static final int TYPE_CHEST_STRAP;
+    property public static final int TYPE_FITNESS_BAND;
+    property public static final int TYPE_HEAD_MOUNTED;
+    property public static final int TYPE_PHONE;
+    property public static final int TYPE_RING;
+    property public static final int TYPE_SCALE;
+    property public static final int TYPE_SMART_DISPLAY;
+    property public static final int TYPE_UNKNOWN;
+    property public static final int TYPE_WATCH;
   }
 
   public final class Metadata {
@@ -1658,6 +1979,10 @@
   }
 
   public static final class Metadata.Companion {
+    property public static final int RECORDING_METHOD_ACTIVELY_RECORDED;
+    property public static final int RECORDING_METHOD_AUTOMATICALLY_RECORDED;
+    property public static final int RECORDING_METHOD_MANUAL_ENTRY;
+    property public static final int RECORDING_METHOD_UNKNOWN;
   }
 
 }
diff --git a/health/connect/connect-testing/api/current.txt b/health/connect/connect-testing/api/current.txt
index 5f827e8..df213f9 100644
--- a/health/connect/connect-testing/api/current.txt
+++ b/health/connect/connect-testing/api/current.txt
@@ -35,6 +35,7 @@
   }
 
   public static final class FakeHealthConnectClient.Companion {
+    property public static final String DEFAULT_PACKAGE_NAME;
   }
 
   public final class FakeHealthConnectClientOverrides {
diff --git a/health/connect/connect-testing/api/restricted_current.txt b/health/connect/connect-testing/api/restricted_current.txt
index 5f827e8..df213f9 100644
--- a/health/connect/connect-testing/api/restricted_current.txt
+++ b/health/connect/connect-testing/api/restricted_current.txt
@@ -35,6 +35,7 @@
   }
 
   public static final class FakeHealthConnectClient.Companion {
+    property public static final String DEFAULT_PACKAGE_NAME;
   }
 
   public final class FakeHealthConnectClientOverrides {
diff --git a/health/health-services-client/api/current.txt b/health/health-services-client/api/current.txt
index 83398ee..a3e400a 100644
--- a/health/health-services-client/api/current.txt
+++ b/health/health-services-client/api/current.txt
@@ -154,6 +154,7 @@
   }
 
   public static final class BatchingMode.Companion {
+    property public final androidx.health.services.client.data.BatchingMode HEART_RATE_5_SECONDS;
   }
 
   public final class ComparisonType {
@@ -170,6 +171,11 @@
   }
 
   public static final class ComparisonType.Companion {
+    property public final androidx.health.services.client.data.ComparisonType GREATER_THAN;
+    property public final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
+    property public final androidx.health.services.client.data.ComparisonType LESS_THAN;
+    property public final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
+    property public final androidx.health.services.client.data.ComparisonType UNKNOWN;
   }
 
   public final class CumulativeDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
@@ -283,6 +289,71 @@
   }
 
   public static final class DataType.Companion {
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION_STATS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> ACTIVE_EXERCISE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> CALORIES_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DECLINE_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DECLINE_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> DECLINE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> DECLINE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_GAIN_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_LOSS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_LOSS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> FLAT_GROUND_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> FLAT_GROUND_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLOORS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> GOLF_SHOT_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> GOLF_SHOT_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> GROUND_CONTACT_TIME;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> GROUND_CONTACT_TIME_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> HEART_RATE_BPM;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> HEART_RATE_BPM_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> INCLINE_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> INCLINE_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> INCLINE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> INCLINE_DURATION_TOTAL;
+    property public 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;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> PACE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> PACE_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> REP_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> REP_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RUNNING_STEPS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RUNNING_STEPS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> SPEED;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> SPEED_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS_DAILY;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> STEPS_PER_MINUTE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> STEPS_PER_MINUTE_STATS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> STEPS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> STRIDE_LENGTH;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> STRIDE_LENGTH_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_STROKES;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_STROKES_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VERTICAL_OSCILLATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VERTICAL_OSCILLATION_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VERTICAL_RATIO;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VERTICAL_RATIO_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VO2_MAX;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VO2_MAX_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> WALKING_STEPS;
+    property public 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.TimeType {
@@ -297,6 +368,9 @@
   }
 
   public static final class DataType.TimeType.Companion {
+    property public final androidx.health.services.client.data.DataType.TimeType INTERVAL;
+    property public final androidx.health.services.client.data.DataType.TimeType SAMPLE;
+    property public final androidx.health.services.client.data.DataType.TimeType UNKNOWN;
   }
 
   public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
@@ -315,6 +389,11 @@
 
   public static final class DataTypeAvailability.Companion {
     method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+    property public final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
+    property public final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
   }
 
   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>>> {
@@ -432,6 +511,7 @@
 
   public static final class ExerciseConfig.Companion {
     method public androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
+    property public static final float SWIMMING_POOL_LENGTH_UNSPECIFIED;
   }
 
   public abstract class ExerciseEvent {
@@ -457,6 +537,8 @@
   }
 
   public static final class ExerciseEventType.Companion {
+    property public final androidx.health.services.client.data.ExerciseEventType<androidx.health.services.client.data.GolfShotEventCapabilities> GOLF_SHOT_EVENT;
+    property public final androidx.health.services.client.data.ExerciseEventType<androidx.health.services.client.data.ExerciseEventCapabilities> UNKNOWN;
   }
 
   public final class ExerciseGoal<T extends java.lang.Number> implements android.os.Parcelable {
@@ -479,6 +561,7 @@
     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,? extends java.lang.Object?>> 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,? extends java.lang.Object?>> condition);
+    property public final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Object?>> CREATOR;
   }
 
   public final class ExerciseGoalType {
@@ -494,6 +577,8 @@
 
   public static final class ExerciseGoalType.Companion {
     method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
+    property public final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
   }
 
   public final class ExerciseInfo {
@@ -548,6 +633,17 @@
 
   public static final class ExerciseState.Companion {
     method public androidx.health.services.client.data.ExerciseState? fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseState ACTIVE;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
+    property public final androidx.health.services.client.data.ExerciseState ENDED;
+    property public final androidx.health.services.client.data.ExerciseState ENDING;
+    property public final androidx.health.services.client.data.ExerciseState PREPARING;
+    property public final androidx.health.services.client.data.ExerciseState USER_PAUSED;
+    property public final androidx.health.services.client.data.ExerciseState USER_PAUSING;
+    property public final androidx.health.services.client.data.ExerciseState USER_RESUMING;
+    property public final androidx.health.services.client.data.ExerciseState USER_STARTING;
   }
 
   public final class ExerciseStateInfo {
@@ -658,6 +754,91 @@
 
   public static final class ExerciseType.Companion {
     method public androidx.health.services.client.data.ExerciseType fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
+    property public final androidx.health.services.client.data.ExerciseType BACKPACKING;
+    property public final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
+    property public final androidx.health.services.client.data.ExerciseType BADMINTON;
+    property public final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
+    property public final androidx.health.services.client.data.ExerciseType BASEBALL;
+    property public final androidx.health.services.client.data.ExerciseType BASKETBALL;
+    property public final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
+    property public final androidx.health.services.client.data.ExerciseType BIKING;
+    property public final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
+    property public final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
+    property public final androidx.health.services.client.data.ExerciseType BOXING;
+    property public final androidx.health.services.client.data.ExerciseType BURPEE;
+    property public final androidx.health.services.client.data.ExerciseType CALISTHENICS;
+    property public final androidx.health.services.client.data.ExerciseType CRICKET;
+    property public final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
+    property public final androidx.health.services.client.data.ExerciseType CRUNCH;
+    property public final androidx.health.services.client.data.ExerciseType DANCING;
+    property public final androidx.health.services.client.data.ExerciseType DEADLIFT;
+    property public final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
+    property public final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
+    property public final androidx.health.services.client.data.ExerciseType FENCING;
+    property public final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
+    property public final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
+    property public final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
+    property public final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
+    property public final androidx.health.services.client.data.ExerciseType GOLF;
+    property public final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
+    property public final androidx.health.services.client.data.ExerciseType GYMNASTICS;
+    property public final androidx.health.services.client.data.ExerciseType HANDBALL;
+    property public final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public final androidx.health.services.client.data.ExerciseType HIKING;
+    property public final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
+    property public final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
+    property public final androidx.health.services.client.data.ExerciseType ICE_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
+    property public final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
+    property public final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
+    property public final androidx.health.services.client.data.ExerciseType LUNGE;
+    property public final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
+    property public final androidx.health.services.client.data.ExerciseType MEDITATION;
+    property public final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
+    property public final androidx.health.services.client.data.ExerciseType ORIENTEERING;
+    property public final androidx.health.services.client.data.ExerciseType PADDLING;
+    property public final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
+    property public final androidx.health.services.client.data.ExerciseType PILATES;
+    property public final androidx.health.services.client.data.ExerciseType PLANK;
+    property public final androidx.health.services.client.data.ExerciseType RACQUETBALL;
+    property public final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
+    property public final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
+    property public final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType ROWING;
+    property public final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
+    property public final androidx.health.services.client.data.ExerciseType RUGBY;
+    property public final androidx.health.services.client.data.ExerciseType RUNNING;
+    property public final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
+    property public final androidx.health.services.client.data.ExerciseType SAILING;
+    property public final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
+    property public final androidx.health.services.client.data.ExerciseType SKATING;
+    property public final androidx.health.services.client.data.ExerciseType SKIING;
+    property public final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
+    property public final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
+    property public final androidx.health.services.client.data.ExerciseType SOCCER;
+    property public final androidx.health.services.client.data.ExerciseType SOFTBALL;
+    property public final androidx.health.services.client.data.ExerciseType SQUASH;
+    property public final androidx.health.services.client.data.ExerciseType SQUAT;
+    property public final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
+    property public final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
+    property public final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
+    property public final androidx.health.services.client.data.ExerciseType STRETCHING;
+    property public final androidx.health.services.client.data.ExerciseType SURFING;
+    property public final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
+    property public final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
+    property public final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
+    property public final androidx.health.services.client.data.ExerciseType TENNIS;
+    property public final androidx.health.services.client.data.ExerciseType UNKNOWN;
+    property public final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
+    property public final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
+    property public final androidx.health.services.client.data.ExerciseType WALKING;
+    property public final androidx.health.services.client.data.ExerciseType WATER_POLO;
+    property public final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
+    property public final androidx.health.services.client.data.ExerciseType WORKOUT;
+    property public final androidx.health.services.client.data.ExerciseType YACHTING;
+    property public final androidx.health.services.client.data.ExerciseType YOGA;
   }
 
   public final class ExerciseTypeCapabilities {
@@ -738,6 +919,10 @@
   }
 
   public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion {
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_FAIRWAY;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_PUTTING_GREEN;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_TEE_BOX;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_UNSPECIFIED;
   }
 
   public final class GolfShotEvent extends androidx.health.services.client.data.ExerciseEvent {
@@ -757,6 +942,10 @@
   }
 
   public static final class GolfShotEvent.GolfShotSwingType.Companion {
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType FULL;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType PARTIAL;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType PUTT;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType UNKNOWN;
   }
 
   public final class GolfShotEventCapabilities extends androidx.health.services.client.data.ExerciseEventCapabilities {
@@ -788,6 +977,8 @@
   }
 
   public static final class HealthEvent.Type.Companion {
+    property public final androidx.health.services.client.data.HealthEvent.Type FALL_DETECTED;
+    property public final androidx.health.services.client.data.HealthEvent.Type UNKNOWN;
   }
 
   public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
@@ -811,6 +1002,12 @@
   }
 
   public static final class HeartRateAccuracy.SensorStatus.Companion {
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
   }
 
   public final class IntervalDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
@@ -860,6 +1057,12 @@
 
   public static final class LocationAvailability.Companion {
     method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRING;
+    property public final androidx.health.services.client.data.LocationAvailability NO_GNSS;
+    property public final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
+    property public final androidx.health.services.client.data.LocationAvailability UNKNOWN;
   }
 
   public final class LocationData {
@@ -1018,6 +1221,10 @@
   }
 
   public static final class UserActivityState.Companion {
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
   }
 
   public final class WarmUpConfig {
diff --git a/health/health-services-client/api/restricted_current.txt b/health/health-services-client/api/restricted_current.txt
index 2831385..5ddb535 100644
--- a/health/health-services-client/api/restricted_current.txt
+++ b/health/health-services-client/api/restricted_current.txt
@@ -154,6 +154,7 @@
   }
 
   public static final class BatchingMode.Companion {
+    property public final androidx.health.services.client.data.BatchingMode HEART_RATE_5_SECONDS;
   }
 
   public final class ComparisonType {
@@ -170,6 +171,11 @@
   }
 
   public static final class ComparisonType.Companion {
+    property public final androidx.health.services.client.data.ComparisonType GREATER_THAN;
+    property public final androidx.health.services.client.data.ComparisonType GREATER_THAN_OR_EQUAL;
+    property public final androidx.health.services.client.data.ComparisonType LESS_THAN;
+    property public final androidx.health.services.client.data.ComparisonType LESS_THAN_OR_EQUAL;
+    property public final androidx.health.services.client.data.ComparisonType UNKNOWN;
   }
 
   public final class CumulativeDataPoint<T extends java.lang.Number> extends androidx.health.services.client.data.DataPoint<T> {
@@ -283,6 +289,71 @@
   }
 
   public static final class DataType.Companion {
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> ABSOLUTE_ELEVATION_STATS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> ACTIVE_EXERCISE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> CALORIES_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> CALORIES_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DECLINE_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DECLINE_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> DECLINE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> DECLINE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> DISTANCE_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_GAIN_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_GAIN_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> ELEVATION_LOSS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> ELEVATION_LOSS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLAT_GROUND_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> FLAT_GROUND_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> FLAT_GROUND_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> FLOORS_DAILY;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> FLOORS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> GOLF_SHOT_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> GOLF_SHOT_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> GROUND_CONTACT_TIME;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> GROUND_CONTACT_TIME_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> HEART_RATE_BPM;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> HEART_RATE_BPM_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.IntervalDataPoint<java.lang.Double>> INCLINE_DISTANCE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Double>> INCLINE_DISTANCE_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> INCLINE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> INCLINE_DURATION_TOTAL;
+    property public 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;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> PACE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> PACE_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> REP_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> REP_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RESTING_EXERCISE_DURATION_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> RUNNING_STEPS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> RUNNING_STEPS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> SPEED;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> SPEED_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> STEPS_DAILY;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.SampleDataPoint<java.lang.Long>> STEPS_PER_MINUTE;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Long>> STEPS_PER_MINUTE_STATS;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> STEPS_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> STRIDE_LENGTH;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> STRIDE_LENGTH_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_LAP_COUNT_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> SWIMMING_STROKES;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Long,androidx.health.services.client.data.CumulativeDataPoint<java.lang.Long>> SWIMMING_STROKES_TOTAL;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VERTICAL_OSCILLATION;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VERTICAL_OSCILLATION_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VERTICAL_RATIO;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VERTICAL_RATIO_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Double,androidx.health.services.client.data.SampleDataPoint<java.lang.Double>> VO2_MAX;
+    property public final androidx.health.services.client.data.AggregateDataType<java.lang.Double,androidx.health.services.client.data.StatisticalDataPoint<java.lang.Double>> VO2_MAX_STATS;
+    property public final androidx.health.services.client.data.DeltaDataType<java.lang.Long,androidx.health.services.client.data.IntervalDataPoint<java.lang.Long>> WALKING_STEPS;
+    property public 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.TimeType {
@@ -297,6 +368,9 @@
   }
 
   public static final class DataType.TimeType.Companion {
+    property public final androidx.health.services.client.data.DataType.TimeType INTERVAL;
+    property public final androidx.health.services.client.data.DataType.TimeType SAMPLE;
+    property public final androidx.health.services.client.data.DataType.TimeType UNKNOWN;
   }
 
   public final class DataTypeAvailability implements androidx.health.services.client.data.Availability {
@@ -315,6 +389,11 @@
 
   public static final class DataTypeAvailability.Companion {
     method public androidx.health.services.client.data.DataTypeAvailability? fromId(int id);
+    property public final androidx.health.services.client.data.DataTypeAvailability ACQUIRING;
+    property public final androidx.health.services.client.data.DataTypeAvailability AVAILABLE;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNAVAILABLE_DEVICE_OFF_BODY;
+    property public final androidx.health.services.client.data.DataTypeAvailability UNKNOWN;
   }
 
   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>>> {
@@ -432,6 +511,7 @@
 
   public static final class ExerciseConfig.Companion {
     method public androidx.health.services.client.data.ExerciseConfig.Builder builder(androidx.health.services.client.data.ExerciseType exerciseType);
+    property public static final float SWIMMING_POOL_LENGTH_UNSPECIFIED;
   }
 
   public abstract class ExerciseEvent {
@@ -459,6 +539,8 @@
   }
 
   public static final class ExerciseEventType.Companion {
+    property public final androidx.health.services.client.data.ExerciseEventType<androidx.health.services.client.data.GolfShotEventCapabilities> GOLF_SHOT_EVENT;
+    property public final androidx.health.services.client.data.ExerciseEventType<androidx.health.services.client.data.ExerciseEventCapabilities> UNKNOWN;
   }
 
   public final class ExerciseGoal<T extends java.lang.Number> implements android.os.Parcelable {
@@ -481,6 +563,7 @@
     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,? extends java.lang.Object?>> 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,? extends java.lang.Object?>> condition);
+    property public final android.os.Parcelable.Creator<androidx.health.services.client.data.ExerciseGoal<? extends java.lang.Object?>> CREATOR;
   }
 
   public final class ExerciseGoalType {
@@ -496,6 +579,8 @@
 
   public static final class ExerciseGoalType.Companion {
     method public androidx.health.services.client.data.ExerciseGoalType? fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseGoalType MILESTONE;
+    property public final androidx.health.services.client.data.ExerciseGoalType ONE_TIME_GOAL;
   }
 
   public final class ExerciseInfo {
@@ -550,6 +635,17 @@
 
   public static final class ExerciseState.Companion {
     method public androidx.health.services.client.data.ExerciseState? fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseState ACTIVE;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_PAUSED;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_PAUSING;
+    property public final androidx.health.services.client.data.ExerciseState AUTO_RESUMING;
+    property public final androidx.health.services.client.data.ExerciseState ENDED;
+    property public final androidx.health.services.client.data.ExerciseState ENDING;
+    property public final androidx.health.services.client.data.ExerciseState PREPARING;
+    property public final androidx.health.services.client.data.ExerciseState USER_PAUSED;
+    property public final androidx.health.services.client.data.ExerciseState USER_PAUSING;
+    property public final androidx.health.services.client.data.ExerciseState USER_RESUMING;
+    property public final androidx.health.services.client.data.ExerciseState USER_STARTING;
   }
 
   public final class ExerciseStateInfo {
@@ -660,6 +756,91 @@
 
   public static final class ExerciseType.Companion {
     method public androidx.health.services.client.data.ExerciseType fromId(int id);
+    property public final androidx.health.services.client.data.ExerciseType ALPINE_SKIING;
+    property public final androidx.health.services.client.data.ExerciseType BACKPACKING;
+    property public final androidx.health.services.client.data.ExerciseType BACK_EXTENSION;
+    property public final androidx.health.services.client.data.ExerciseType BADMINTON;
+    property public final androidx.health.services.client.data.ExerciseType BARBELL_SHOULDER_PRESS;
+    property public final androidx.health.services.client.data.ExerciseType BASEBALL;
+    property public final androidx.health.services.client.data.ExerciseType BASKETBALL;
+    property public final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
+    property public final androidx.health.services.client.data.ExerciseType BIKING;
+    property public final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
+    property public final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
+    property public final androidx.health.services.client.data.ExerciseType BOXING;
+    property public final androidx.health.services.client.data.ExerciseType BURPEE;
+    property public final androidx.health.services.client.data.ExerciseType CALISTHENICS;
+    property public final androidx.health.services.client.data.ExerciseType CRICKET;
+    property public final androidx.health.services.client.data.ExerciseType CROSS_COUNTRY_SKIING;
+    property public final androidx.health.services.client.data.ExerciseType CRUNCH;
+    property public final androidx.health.services.client.data.ExerciseType DANCING;
+    property public final androidx.health.services.client.data.ExerciseType DEADLIFT;
+    property public final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
+    property public final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
+    property public final androidx.health.services.client.data.ExerciseType FENCING;
+    property public final androidx.health.services.client.data.ExerciseType FOOTBALL_AMERICAN;
+    property public final androidx.health.services.client.data.ExerciseType FOOTBALL_AUSTRALIAN;
+    property public final androidx.health.services.client.data.ExerciseType FORWARD_TWIST;
+    property public final androidx.health.services.client.data.ExerciseType FRISBEE_DISC;
+    property public final androidx.health.services.client.data.ExerciseType GOLF;
+    property public final androidx.health.services.client.data.ExerciseType GUIDED_BREATHING;
+    property public final androidx.health.services.client.data.ExerciseType GYMNASTICS;
+    property public final androidx.health.services.client.data.ExerciseType HANDBALL;
+    property public final androidx.health.services.client.data.ExerciseType HIGH_INTENSITY_INTERVAL_TRAINING;
+    property public final androidx.health.services.client.data.ExerciseType HIKING;
+    property public final androidx.health.services.client.data.ExerciseType HORSE_RIDING;
+    property public final androidx.health.services.client.data.ExerciseType ICE_HOCKEY;
+    property public final androidx.health.services.client.data.ExerciseType ICE_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType INLINE_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType JUMPING_JACK;
+    property public final androidx.health.services.client.data.ExerciseType JUMP_ROPE;
+    property public final androidx.health.services.client.data.ExerciseType LAT_PULL_DOWN;
+    property public final androidx.health.services.client.data.ExerciseType LUNGE;
+    property public final androidx.health.services.client.data.ExerciseType MARTIAL_ARTS;
+    property public final androidx.health.services.client.data.ExerciseType MEDITATION;
+    property public final androidx.health.services.client.data.ExerciseType MOUNTAIN_BIKING;
+    property public final androidx.health.services.client.data.ExerciseType ORIENTEERING;
+    property public final androidx.health.services.client.data.ExerciseType PADDLING;
+    property public final androidx.health.services.client.data.ExerciseType PARA_GLIDING;
+    property public final androidx.health.services.client.data.ExerciseType PILATES;
+    property public final androidx.health.services.client.data.ExerciseType PLANK;
+    property public final androidx.health.services.client.data.ExerciseType RACQUETBALL;
+    property public final androidx.health.services.client.data.ExerciseType ROCK_CLIMBING;
+    property public final androidx.health.services.client.data.ExerciseType ROLLER_HOCKEY;
+    property public final androidx.health.services.client.data.ExerciseType ROLLER_SKATING;
+    property public final androidx.health.services.client.data.ExerciseType ROWING;
+    property public final androidx.health.services.client.data.ExerciseType ROWING_MACHINE;
+    property public final androidx.health.services.client.data.ExerciseType RUGBY;
+    property public final androidx.health.services.client.data.ExerciseType RUNNING;
+    property public final androidx.health.services.client.data.ExerciseType RUNNING_TREADMILL;
+    property public final androidx.health.services.client.data.ExerciseType SAILING;
+    property public final androidx.health.services.client.data.ExerciseType SCUBA_DIVING;
+    property public final androidx.health.services.client.data.ExerciseType SKATING;
+    property public final androidx.health.services.client.data.ExerciseType SKIING;
+    property public final androidx.health.services.client.data.ExerciseType SNOWBOARDING;
+    property public final androidx.health.services.client.data.ExerciseType SNOWSHOEING;
+    property public final androidx.health.services.client.data.ExerciseType SOCCER;
+    property public final androidx.health.services.client.data.ExerciseType SOFTBALL;
+    property public final androidx.health.services.client.data.ExerciseType SQUASH;
+    property public final androidx.health.services.client.data.ExerciseType SQUAT;
+    property public final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING;
+    property public final androidx.health.services.client.data.ExerciseType STAIR_CLIMBING_MACHINE;
+    property public final androidx.health.services.client.data.ExerciseType STRENGTH_TRAINING;
+    property public final androidx.health.services.client.data.ExerciseType STRETCHING;
+    property public final androidx.health.services.client.data.ExerciseType SURFING;
+    property public final androidx.health.services.client.data.ExerciseType SWIMMING_OPEN_WATER;
+    property public final androidx.health.services.client.data.ExerciseType SWIMMING_POOL;
+    property public final androidx.health.services.client.data.ExerciseType TABLE_TENNIS;
+    property public final androidx.health.services.client.data.ExerciseType TENNIS;
+    property public final androidx.health.services.client.data.ExerciseType UNKNOWN;
+    property public final androidx.health.services.client.data.ExerciseType UPPER_TWIST;
+    property public final androidx.health.services.client.data.ExerciseType VOLLEYBALL;
+    property public final androidx.health.services.client.data.ExerciseType WALKING;
+    property public final androidx.health.services.client.data.ExerciseType WATER_POLO;
+    property public final androidx.health.services.client.data.ExerciseType WEIGHTLIFTING;
+    property public final androidx.health.services.client.data.ExerciseType WORKOUT;
+    property public final androidx.health.services.client.data.ExerciseType YACHTING;
+    property public final androidx.health.services.client.data.ExerciseType YOGA;
   }
 
   public final class ExerciseTypeCapabilities {
@@ -740,6 +921,10 @@
   }
 
   public static final class GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo.Companion {
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_FAIRWAY;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_PUTTING_GREEN;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_TEE_BOX;
+    property public final androidx.health.services.client.data.GolfExerciseTypeConfig.GolfShotTrackingPlaceInfo GOLF_SHOT_TRACKING_PLACE_INFO_UNSPECIFIED;
   }
 
   public final class GolfShotEvent extends androidx.health.services.client.data.ExerciseEvent {
@@ -759,6 +944,10 @@
   }
 
   public static final class GolfShotEvent.GolfShotSwingType.Companion {
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType FULL;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType PARTIAL;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType PUTT;
+    property public final androidx.health.services.client.data.GolfShotEvent.GolfShotSwingType UNKNOWN;
   }
 
   public final class GolfShotEventCapabilities extends androidx.health.services.client.data.ExerciseEventCapabilities {
@@ -790,6 +979,8 @@
   }
 
   public static final class HealthEvent.Type.Companion {
+    property public final androidx.health.services.client.data.HealthEvent.Type FALL_DETECTED;
+    property public final androidx.health.services.client.data.HealthEvent.Type UNKNOWN;
   }
 
   public final class HeartRateAccuracy extends androidx.health.services.client.data.DataPointAccuracy {
@@ -813,6 +1004,12 @@
   }
 
   public static final class HeartRateAccuracy.SensorStatus.Companion {
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_HIGH;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_LOW;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus ACCURACY_MEDIUM;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus NO_CONTACT;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNKNOWN;
+    property public final androidx.health.services.client.data.HeartRateAccuracy.SensorStatus UNRELIABLE;
   }
 
   public final class IntervalDataPoint<T> extends androidx.health.services.client.data.DataPoint<T> {
@@ -862,6 +1059,12 @@
 
   public static final class LocationAvailability.Companion {
     method public androidx.health.services.client.data.LocationAvailability? fromId(int id);
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRED_TETHERED;
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRED_UNTETHERED;
+    property public final androidx.health.services.client.data.LocationAvailability ACQUIRING;
+    property public final androidx.health.services.client.data.LocationAvailability NO_GNSS;
+    property public final androidx.health.services.client.data.LocationAvailability UNAVAILABLE;
+    property public final androidx.health.services.client.data.LocationAvailability UNKNOWN;
   }
 
   public final class LocationData {
@@ -1020,6 +1223,10 @@
   }
 
   public static final class UserActivityState.Companion {
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_ASLEEP;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_EXERCISE;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_PASSIVE;
+    property public final androidx.health.services.client.data.UserActivityState USER_ACTIVITY_UNKNOWN;
   }
 
   public final class WarmUpConfig {
diff --git a/ink/ink-brush/api/current.txt b/ink/ink-brush/api/current.txt
index c477ccc..cfc8e24 100644
--- a/ink/ink-brush/api/current.txt
+++ b/ink/ink-brush/api/current.txt
@@ -71,6 +71,7 @@
   }
 
   public final class InputToolType {
+    property public final int value;
     field public static final androidx.ink.brush.InputToolType.Companion Companion;
     field public static final androidx.ink.brush.InputToolType MOUSE;
     field public static final androidx.ink.brush.InputToolType STYLUS;
@@ -79,6 +80,10 @@
   }
 
   public static final class InputToolType.Companion {
+    property public final androidx.ink.brush.InputToolType MOUSE;
+    property public final androidx.ink.brush.InputToolType STYLUS;
+    property public final androidx.ink.brush.InputToolType TOUCH;
+    property public final androidx.ink.brush.InputToolType UNKNOWN;
   }
 
   public final class StockBrushes {
diff --git a/ink/ink-brush/api/restricted_current.txt b/ink/ink-brush/api/restricted_current.txt
index c477ccc..cfc8e24 100644
--- a/ink/ink-brush/api/restricted_current.txt
+++ b/ink/ink-brush/api/restricted_current.txt
@@ -71,6 +71,7 @@
   }
 
   public final class InputToolType {
+    property public final int value;
     field public static final androidx.ink.brush.InputToolType.Companion Companion;
     field public static final androidx.ink.brush.InputToolType MOUSE;
     field public static final androidx.ink.brush.InputToolType STYLUS;
@@ -79,6 +80,10 @@
   }
 
   public static final class InputToolType.Companion {
+    property public final androidx.ink.brush.InputToolType MOUSE;
+    property public final androidx.ink.brush.InputToolType STYLUS;
+    property public final androidx.ink.brush.InputToolType TOUCH;
+    property public final androidx.ink.brush.InputToolType UNKNOWN;
   }
 
   public final class StockBrushes {
diff --git a/ink/ink-geometry/api/current.txt b/ink/ink-geometry/api/current.txt
index 11d3b99..96116fe 100644
--- a/ink/ink-geometry/api/current.txt
+++ b/ink/ink-geometry/api/current.txt
@@ -15,6 +15,7 @@
   }
 
   public static final class AffineTransform.Companion {
+    property public final androidx.ink.geometry.ImmutableAffineTransform IDENTITY;
   }
 
   public final class Angle {
@@ -22,6 +23,10 @@
     method @FloatRange(from=0.0, to=androidx.ink.geometry.Angle.FULL_TURN_RADIANS_DOUBLE) @androidx.ink.geometry.AngleRadiansFloat public static float normalized(@androidx.ink.geometry.AngleRadiansFloat float radians);
     method @FloatRange(from=-3.141592653589793, to=androidx.ink.geometry.Angle.HALF_TURN_RADIANS_DOUBLE) @androidx.ink.geometry.AngleRadiansFloat public static float normalizedAboutZero(@androidx.ink.geometry.AngleRadiansFloat float radians);
     method @androidx.ink.geometry.AngleDegreesFloat public static float radiansToDegrees(@androidx.ink.geometry.AngleRadiansFloat float radians);
+    property @androidx.ink.geometry.AngleRadiansFloat public final float FULL_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float HALF_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float QUARTER_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float ZERO;
     field @androidx.ink.geometry.AngleRadiansFloat public static final float FULL_TURN_RADIANS;
     field @androidx.ink.geometry.AngleRadiansFloat public static final float HALF_TURN_RADIANS;
     field public static final androidx.ink.geometry.Angle INSTANCE;
@@ -438,6 +443,7 @@
     method public void multiply(float lhs, androidx.ink.geometry.Vec rhs, androidx.ink.geometry.MutableVec output);
     method @FloatRange(from=-3.141592653589793, to=java.lang.Math.PI, fromInclusive=false) @androidx.ink.geometry.AngleRadiansFloat public float signedAngleBetween(androidx.ink.geometry.Vec lhs, androidx.ink.geometry.Vec rhs);
     method public void subtract(androidx.ink.geometry.Vec lhs, androidx.ink.geometry.Vec rhs, androidx.ink.geometry.MutableVec output);
+    property public final androidx.ink.geometry.ImmutableVec ORIGIN;
   }
 
 }
diff --git a/ink/ink-geometry/api/restricted_current.txt b/ink/ink-geometry/api/restricted_current.txt
index 11d3b99..96116fe 100644
--- a/ink/ink-geometry/api/restricted_current.txt
+++ b/ink/ink-geometry/api/restricted_current.txt
@@ -15,6 +15,7 @@
   }
 
   public static final class AffineTransform.Companion {
+    property public final androidx.ink.geometry.ImmutableAffineTransform IDENTITY;
   }
 
   public final class Angle {
@@ -22,6 +23,10 @@
     method @FloatRange(from=0.0, to=androidx.ink.geometry.Angle.FULL_TURN_RADIANS_DOUBLE) @androidx.ink.geometry.AngleRadiansFloat public static float normalized(@androidx.ink.geometry.AngleRadiansFloat float radians);
     method @FloatRange(from=-3.141592653589793, to=androidx.ink.geometry.Angle.HALF_TURN_RADIANS_DOUBLE) @androidx.ink.geometry.AngleRadiansFloat public static float normalizedAboutZero(@androidx.ink.geometry.AngleRadiansFloat float radians);
     method @androidx.ink.geometry.AngleDegreesFloat public static float radiansToDegrees(@androidx.ink.geometry.AngleRadiansFloat float radians);
+    property @androidx.ink.geometry.AngleRadiansFloat public final float FULL_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float HALF_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float QUARTER_TURN_RADIANS;
+    property @androidx.ink.geometry.AngleRadiansFloat public final float ZERO;
     field @androidx.ink.geometry.AngleRadiansFloat public static final float FULL_TURN_RADIANS;
     field @androidx.ink.geometry.AngleRadiansFloat public static final float HALF_TURN_RADIANS;
     field public static final androidx.ink.geometry.Angle INSTANCE;
@@ -438,6 +443,7 @@
     method public void multiply(float lhs, androidx.ink.geometry.Vec rhs, androidx.ink.geometry.MutableVec output);
     method @FloatRange(from=-3.141592653589793, to=java.lang.Math.PI, fromInclusive=false) @androidx.ink.geometry.AngleRadiansFloat public float signedAngleBetween(androidx.ink.geometry.Vec lhs, androidx.ink.geometry.Vec rhs);
     method public void subtract(androidx.ink.geometry.Vec lhs, androidx.ink.geometry.Vec rhs, androidx.ink.geometry.MutableVec output);
+    property public final androidx.ink.geometry.ImmutableVec ORIGIN;
   }
 
 }
diff --git a/ink/ink-strokes/api/current.txt b/ink/ink-strokes/api/current.txt
index a81e872..049db3a 100644
--- a/ink/ink-strokes/api/current.txt
+++ b/ink/ink-strokes/api/current.txt
@@ -7,6 +7,7 @@
   }
 
   public static final class ImmutableStrokeInputBatch.Companion {
+    property public final androidx.ink.strokes.ImmutableStrokeInputBatch EMPTY;
   }
 
   public final class InProgressStroke {
@@ -131,6 +132,10 @@
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure);
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure, optional float tiltRadians);
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure, optional float tiltRadians, optional float orientationRadians);
+    property public static final float NO_ORIENTATION;
+    property public static final float NO_PRESSURE;
+    property public static final float NO_STROKE_UNIT_LENGTH;
+    property public static final float NO_TILT;
   }
 
   public abstract class StrokeInputBatch {
diff --git a/ink/ink-strokes/api/restricted_current.txt b/ink/ink-strokes/api/restricted_current.txt
index a81e872..049db3a 100644
--- a/ink/ink-strokes/api/restricted_current.txt
+++ b/ink/ink-strokes/api/restricted_current.txt
@@ -7,6 +7,7 @@
   }
 
   public static final class ImmutableStrokeInputBatch.Companion {
+    property public final androidx.ink.strokes.ImmutableStrokeInputBatch EMPTY;
   }
 
   public final class InProgressStroke {
@@ -131,6 +132,10 @@
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure);
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure, optional float tiltRadians);
     method @VisibleForTesting public androidx.ink.strokes.StrokeInput create(float x, float y, @IntRange(from=0L) long elapsedTimeMillis, optional androidx.ink.brush.InputToolType toolType, optional float strokeUnitLengthCm, optional float pressure, optional float tiltRadians, optional float orientationRadians);
+    property public static final float NO_ORIENTATION;
+    property public static final float NO_PRESSURE;
+    property public static final float NO_STROKE_UNIT_LENGTH;
+    property public static final float NO_TILT;
   }
 
   public abstract class StrokeInputBatch {
diff --git a/lifecycle/lifecycle-runtime/api/restricted_current.txt b/lifecycle/lifecycle-runtime/api/restricted_current.txt
index f925edd..30b2784 100644
--- a/lifecycle/lifecycle-runtime/api/restricted_current.txt
+++ b/lifecycle/lifecycle-runtime/api/restricted_current.txt
@@ -61,6 +61,7 @@
   public static final class ReportFragment.Companion {
     method public androidx.lifecycle.ReportFragment get(android.app.Activity);
     method public void injectIfNeededIn(android.app.Activity activity);
+    property public final androidx.lifecycle.ReportFragment reportFragment;
   }
 
   public final class ViewKt {
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
index d5aa091..a818932 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
@@ -29,6 +29,9 @@
   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);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<android.os.Bundle> DEFAULT_ARGS_KEY;
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.savedstate.SavedStateRegistryOwner> SAVED_STATE_REGISTRY_OWNER_KEY;
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.lifecycle.ViewModelStoreOwner> VIEW_MODEL_STORE_OWNER_KEY;
     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;
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
index d5aa091..a818932 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
@@ -29,6 +29,9 @@
   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);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<android.os.Bundle> DEFAULT_ARGS_KEY;
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.savedstate.SavedStateRegistryOwner> SAVED_STATE_REGISTRY_OWNER_KEY;
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<androidx.lifecycle.ViewModelStoreOwner> VIEW_MODEL_STORE_OWNER_KEY;
     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;
diff --git a/lifecycle/lifecycle-viewmodel/api/current.txt b/lifecycle/lifecycle-viewmodel/api/current.txt
index 7181574..d0e2ace 100644
--- a/lifecycle/lifecycle-viewmodel/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel/api/current.txt
@@ -67,11 +67,13 @@
 
   public static final class ViewModelProvider.AndroidViewModelFactory.Companion {
     method public androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory getInstance(android.app.Application application);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<android.app.Application> APPLICATION_KEY;
   }
 
   public static final class ViewModelProvider.Companion {
     method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
     method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<java.lang.String> VIEW_MODEL_KEY;
   }
 
   public static interface ViewModelProvider.Factory {
@@ -93,6 +95,7 @@
   }
 
   public static final class ViewModelProvider.NewInstanceFactory.Companion {
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<java.lang.String> VIEW_MODEL_KEY;
   }
 
   public final class ViewModelProviderGetKt {
diff --git a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
index 7181574..d0e2ace 100644
--- a/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel/api/restricted_current.txt
@@ -67,11 +67,13 @@
 
   public static final class ViewModelProvider.AndroidViewModelFactory.Companion {
     method public androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory getInstance(android.app.Application application);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<android.app.Application> APPLICATION_KEY;
   }
 
   public static final class ViewModelProvider.Companion {
     method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStore store, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
     method public androidx.lifecycle.ViewModelProvider create(androidx.lifecycle.ViewModelStoreOwner owner, optional androidx.lifecycle.ViewModelProvider.Factory factory, optional androidx.lifecycle.viewmodel.CreationExtras extras);
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<java.lang.String> VIEW_MODEL_KEY;
   }
 
   public static interface ViewModelProvider.Factory {
@@ -93,6 +95,7 @@
   }
 
   public static final class ViewModelProvider.NewInstanceFactory.Companion {
+    property public final androidx.lifecycle.viewmodel.CreationExtras.Key<java.lang.String> VIEW_MODEL_KEY;
   }
 
   public final class ViewModelProviderGetKt {
diff --git a/navigation/navigation-common/api/current.txt b/navigation/navigation-common/api/current.txt
index 513cdd9..e316c78 100644
--- a/navigation/navigation-common/api/current.txt
+++ b/navigation/navigation-common/api/current.txt
@@ -257,6 +257,7 @@
     method public inline <reified T> boolean hasRoute(androidx.navigation.NavDestination);
     method public <T> boolean hasRoute(androidx.navigation.NavDestination, kotlin.reflect.KClass<T> route);
     method protected <C> Class<? extends C?> parseClassFromName(android.content.Context context, String name, Class<? extends C?> expectedClassType);
+    property public final kotlin.sequences.Sequence<? extends androidx.navigation.NavDestination> hierarchy;
   }
 
   @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
@@ -478,6 +479,22 @@
 
   public static final class NavType.Companion {
     method public androidx.navigation.NavType<? extends java.lang.Object?> fromArgType(String? type, String? packageName);
+    property public final androidx.navigation.NavType<boolean[]?> BoolArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Boolean>?> BoolListType;
+    property public final androidx.navigation.NavType<java.lang.Boolean> BoolType;
+    property public final androidx.navigation.NavType<float[]?> FloatArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Float>?> FloatListType;
+    property public final androidx.navigation.NavType<java.lang.Float> FloatType;
+    property public final androidx.navigation.NavType<int[]?> IntArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Integer>?> IntListType;
+    property public final androidx.navigation.NavType<java.lang.Integer> IntType;
+    property public final androidx.navigation.NavType<long[]?> LongArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Long>?> LongListType;
+    property public final androidx.navigation.NavType<java.lang.Long> LongType;
+    property public final androidx.navigation.NavType<java.lang.Integer> ReferenceType;
+    property public final androidx.navigation.NavType<java.lang.String[]?> StringArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.String>?> StringListType;
+    property public final androidx.navigation.NavType<java.lang.String?> StringType;
   }
 
   public static final class NavType.EnumType<D extends java.lang.Enum<?>> extends androidx.navigation.NavType.SerializableType<D> {
diff --git a/navigation/navigation-common/api/restricted_current.txt b/navigation/navigation-common/api/restricted_current.txt
index 513cdd9..e316c78 100644
--- a/navigation/navigation-common/api/restricted_current.txt
+++ b/navigation/navigation-common/api/restricted_current.txt
@@ -257,6 +257,7 @@
     method public inline <reified T> boolean hasRoute(androidx.navigation.NavDestination);
     method public <T> boolean hasRoute(androidx.navigation.NavDestination, kotlin.reflect.KClass<T> route);
     method protected <C> Class<? extends C?> parseClassFromName(android.content.Context context, String name, Class<? extends C?> expectedClassType);
+    property public final kotlin.sequences.Sequence<? extends androidx.navigation.NavDestination> hierarchy;
   }
 
   @androidx.navigation.NavDestinationDsl public class NavDestinationBuilder<D extends androidx.navigation.NavDestination> {
@@ -478,6 +479,22 @@
 
   public static final class NavType.Companion {
     method public androidx.navigation.NavType<? extends java.lang.Object?> fromArgType(String? type, String? packageName);
+    property public final androidx.navigation.NavType<boolean[]?> BoolArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Boolean>?> BoolListType;
+    property public final androidx.navigation.NavType<java.lang.Boolean> BoolType;
+    property public final androidx.navigation.NavType<float[]?> FloatArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Float>?> FloatListType;
+    property public final androidx.navigation.NavType<java.lang.Float> FloatType;
+    property public final androidx.navigation.NavType<int[]?> IntArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Integer>?> IntListType;
+    property public final androidx.navigation.NavType<java.lang.Integer> IntType;
+    property public final androidx.navigation.NavType<long[]?> LongArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.Long>?> LongListType;
+    property public final androidx.navigation.NavType<java.lang.Long> LongType;
+    property public final androidx.navigation.NavType<java.lang.Integer> ReferenceType;
+    property public final androidx.navigation.NavType<java.lang.String[]?> StringArrayType;
+    property public final androidx.navigation.NavType<java.util.List<? extends java.lang.String>?> StringListType;
+    property public final androidx.navigation.NavType<java.lang.String?> StringType;
   }
 
   public static final class NavType.EnumType<D extends java.lang.Enum<?>> extends androidx.navigation.NavType.SerializableType<D> {
diff --git a/navigation/navigation-runtime/api/current.txt b/navigation/navigation-runtime/api/current.txt
index a4cc6458..500930f 100644
--- a/navigation/navigation-runtime/api/current.txt
+++ b/navigation/navigation-runtime/api/current.txt
@@ -165,6 +165,11 @@
 
   public static final class NavController.Companion {
     method @SuppressCompatibility @androidx.navigation.NavDeepLinkSaveStateControl public void enableDeepLinkSaveState(boolean saveState);
+    property public static final String KEY_DEEP_LINK_ARGS;
+    property public static final String KEY_DEEP_LINK_EXTRAS;
+    property public static final String KEY_DEEP_LINK_HANDLED;
+    property public static final String KEY_DEEP_LINK_IDS;
+    property public static final String KEY_DEEP_LINK_INTENT;
   }
 
   public static fun interface NavController.OnDestinationChangedListener {
diff --git a/navigation/navigation-runtime/api/restricted_current.txt b/navigation/navigation-runtime/api/restricted_current.txt
index a4cc6458..500930f 100644
--- a/navigation/navigation-runtime/api/restricted_current.txt
+++ b/navigation/navigation-runtime/api/restricted_current.txt
@@ -165,6 +165,11 @@
 
   public static final class NavController.Companion {
     method @SuppressCompatibility @androidx.navigation.NavDeepLinkSaveStateControl public void enableDeepLinkSaveState(boolean saveState);
+    property public static final String KEY_DEEP_LINK_ARGS;
+    property public static final String KEY_DEEP_LINK_EXTRAS;
+    property public static final String KEY_DEEP_LINK_HANDLED;
+    property public static final String KEY_DEEP_LINK_IDS;
+    property public static final String KEY_DEEP_LINK_INTENT;
   }
 
   public static fun interface NavController.OnDestinationChangedListener {
diff --git a/paging/paging-common/api/current.txt b/paging/paging-common/api/current.txt
index e259faf..f5cffd5 100644
--- a/paging/paging-common/api/current.txt
+++ b/paging/paging-common/api/current.txt
@@ -87,6 +87,9 @@
 
   @Deprecated public static class ItemKeyedDataSource.LoadInitialParams<Key> {
     ctor @Deprecated public ItemKeyedDataSource.LoadInitialParams(Key? requestedInitialKey, int requestedLoadSize, boolean placeholdersEnabled);
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final Key? requestedInitialKey;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final Key? requestedInitialKey;
     field @Deprecated public final int requestedLoadSize;
@@ -94,6 +97,8 @@
 
   @Deprecated public static class ItemKeyedDataSource.LoadParams<Key> {
     ctor @Deprecated public ItemKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
+    property @Deprecated public final Key key;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final Key key;
     field @Deprecated public final int requestedLoadSize;
   }
@@ -183,12 +188,16 @@
 
   @Deprecated public static class PageKeyedDataSource.LoadInitialParams<Key> {
     ctor @Deprecated public PageKeyedDataSource.LoadInitialParams(int requestedLoadSize, boolean placeholdersEnabled);
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final int requestedLoadSize;
   }
 
   @Deprecated public static class PageKeyedDataSource.LoadParams<Key> {
     ctor @Deprecated public PageKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
+    property @Deprecated public final Key key;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final Key key;
     field @Deprecated public final int requestedLoadSize;
   }
@@ -256,6 +265,11 @@
   }
 
   @Deprecated public static final class PagedList.Config {
+    property @Deprecated public final boolean enablePlaceholders;
+    property @Deprecated public final int initialLoadSizeHint;
+    property @Deprecated public final int maxSize;
+    property @Deprecated public final int pageSize;
+    property @Deprecated public final int prefetchDistance;
     field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field @Deprecated public final boolean enablePlaceholders;
     field @Deprecated public final int initialLoadSizeHint;
@@ -297,6 +311,12 @@
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize);
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize);
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize, optional int jumpThreshold);
+    property public final boolean enablePlaceholders;
+    property @IntRange(from=1L) public final int initialLoadSize;
+    property public final int jumpThreshold;
+    property @IntRange(from=2L) public final int maxSize;
+    property public final int pageSize;
+    property @IntRange(from=0L) public final int prefetchDistance;
     field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
@@ -308,6 +328,7 @@
   }
 
   public static final class PagingConfig.Companion {
+    property public static final int MAX_SIZE_UNBOUNDED;
   }
 
   public final class PagingData<T> {
@@ -499,6 +520,7 @@
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
+    property public static final int COUNT_UNDEFINED;
   }
 
   public fun interface PagingSourceFactory<Key, Value> extends kotlin.jvm.functions.Function0<androidx.paging.PagingSource<Key,Value>> {
@@ -558,6 +580,10 @@
 
   @Deprecated public static class PositionalDataSource.LoadInitialParams {
     ctor @Deprecated public PositionalDataSource.LoadInitialParams(int requestedStartPosition, int requestedLoadSize, int pageSize, boolean placeholdersEnabled);
+    property @Deprecated public final int pageSize;
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final int requestedLoadSize;
+    property @Deprecated public final int requestedStartPosition;
     field @Deprecated public final int pageSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final int requestedLoadSize;
@@ -571,6 +597,8 @@
 
   @Deprecated public static class PositionalDataSource.LoadRangeParams {
     ctor @Deprecated public PositionalDataSource.LoadRangeParams(int startPosition, int loadSize);
+    property @Deprecated public final int loadSize;
+    property @Deprecated public final int startPosition;
     field @Deprecated public final int loadSize;
     field @Deprecated public final int startPosition;
   }
diff --git a/paging/paging-common/api/restricted_current.txt b/paging/paging-common/api/restricted_current.txt
index e259faf..f5cffd5 100644
--- a/paging/paging-common/api/restricted_current.txt
+++ b/paging/paging-common/api/restricted_current.txt
@@ -87,6 +87,9 @@
 
   @Deprecated public static class ItemKeyedDataSource.LoadInitialParams<Key> {
     ctor @Deprecated public ItemKeyedDataSource.LoadInitialParams(Key? requestedInitialKey, int requestedLoadSize, boolean placeholdersEnabled);
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final Key? requestedInitialKey;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final Key? requestedInitialKey;
     field @Deprecated public final int requestedLoadSize;
@@ -94,6 +97,8 @@
 
   @Deprecated public static class ItemKeyedDataSource.LoadParams<Key> {
     ctor @Deprecated public ItemKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
+    property @Deprecated public final Key key;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final Key key;
     field @Deprecated public final int requestedLoadSize;
   }
@@ -183,12 +188,16 @@
 
   @Deprecated public static class PageKeyedDataSource.LoadInitialParams<Key> {
     ctor @Deprecated public PageKeyedDataSource.LoadInitialParams(int requestedLoadSize, boolean placeholdersEnabled);
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final int requestedLoadSize;
   }
 
   @Deprecated public static class PageKeyedDataSource.LoadParams<Key> {
     ctor @Deprecated public PageKeyedDataSource.LoadParams(Key key, int requestedLoadSize);
+    property @Deprecated public final Key key;
+    property @Deprecated public final int requestedLoadSize;
     field @Deprecated public final Key key;
     field @Deprecated public final int requestedLoadSize;
   }
@@ -256,6 +265,11 @@
   }
 
   @Deprecated public static final class PagedList.Config {
+    property @Deprecated public final boolean enablePlaceholders;
+    property @Deprecated public final int initialLoadSizeHint;
+    property @Deprecated public final int maxSize;
+    property @Deprecated public final int pageSize;
+    property @Deprecated public final int prefetchDistance;
     field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field @Deprecated public final boolean enablePlaceholders;
     field @Deprecated public final int initialLoadSizeHint;
@@ -297,6 +311,12 @@
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize);
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize);
     ctor public PagingConfig(int pageSize, optional @IntRange(from=0L) int prefetchDistance, optional boolean enablePlaceholders, optional @IntRange(from=1L) int initialLoadSize, optional @IntRange(from=2L) int maxSize, optional int jumpThreshold);
+    property public final boolean enablePlaceholders;
+    property @IntRange(from=1L) public final int initialLoadSize;
+    property public final int jumpThreshold;
+    property @IntRange(from=2L) public final int maxSize;
+    property public final int pageSize;
+    property @IntRange(from=0L) public final int prefetchDistance;
     field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
@@ -308,6 +328,7 @@
   }
 
   public static final class PagingConfig.Companion {
+    property public static final int MAX_SIZE_UNBOUNDED;
   }
 
   public final class PagingData<T> {
@@ -499,6 +520,7 @@
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
+    property public static final int COUNT_UNDEFINED;
   }
 
   public fun interface PagingSourceFactory<Key, Value> extends kotlin.jvm.functions.Function0<androidx.paging.PagingSource<Key,Value>> {
@@ -558,6 +580,10 @@
 
   @Deprecated public static class PositionalDataSource.LoadInitialParams {
     ctor @Deprecated public PositionalDataSource.LoadInitialParams(int requestedStartPosition, int requestedLoadSize, int pageSize, boolean placeholdersEnabled);
+    property @Deprecated public final int pageSize;
+    property @Deprecated public final boolean placeholdersEnabled;
+    property @Deprecated public final int requestedLoadSize;
+    property @Deprecated public final int requestedStartPosition;
     field @Deprecated public final int pageSize;
     field @Deprecated public final boolean placeholdersEnabled;
     field @Deprecated public final int requestedLoadSize;
@@ -571,6 +597,8 @@
 
   @Deprecated public static class PositionalDataSource.LoadRangeParams {
     ctor @Deprecated public PositionalDataSource.LoadRangeParams(int startPosition, int loadSize);
+    property @Deprecated public final int loadSize;
+    property @Deprecated public final int startPosition;
     field @Deprecated public final int loadSize;
     field @Deprecated public final int startPosition;
   }
diff --git a/privacysandbox/ads/ads-adservices/api/1.1.0-beta11.txt b/privacysandbox/ads/ads-adservices/api/1.1.0-beta11.txt
index 384ff4f..e3949b9 100644
--- a/privacysandbox/ads/ads-adservices/api/1.1.0-beta11.txt
+++ b/privacysandbox/ads/ads-adservices/api/1.1.0-beta11.txt
@@ -81,6 +81,7 @@
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final class AdSelectionOutcome.Companion {
+    property @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final class GetAdSelectionDataOutcome {
@@ -132,6 +133,8 @@
   }
 
   public static final class ReportEventRequest.Companion {
+    property public static final int FLAG_REPORTING_DESTINATION_BUYER;
+    property public static final int FLAG_REPORTING_DESTINATION_SELLER;
   }
 
   public final class ReportImpressionRequest {
@@ -169,6 +172,8 @@
   }
 
   public static final class AppSetId.Companion {
+    property public static final int SCOPE_APP;
+    property public static final int SCOPE_DEVELOPER;
   }
 
   public abstract class AppSetIdManager {
@@ -259,6 +264,10 @@
   }
 
   public static final class FrequencyCapFilters.Companion {
+    property public static final int AD_EVENT_TYPE_CLICK;
+    property public static final int AD_EVENT_TYPE_IMPRESSION;
+    property public static final int AD_EVENT_TYPE_VIEW;
+    property public static final int AD_EVENT_TYPE_WIN;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext8OptIn public final class KeyedFrequencyCap {
@@ -398,6 +407,10 @@
   }
 
   public static final class DeletionRequest.Companion {
+    property public static final int DELETION_MODE_ALL;
+    property public static final int DELETION_MODE_EXCLUDE_INTERNAL_DATA;
+    property public static final int MATCH_BEHAVIOR_DELETE;
+    property public static final int MATCH_BEHAVIOR_PRESERVE;
   }
 
   public abstract class MeasurementManager {
@@ -417,6 +430,8 @@
 
   public static final class MeasurementManager.Companion {
     method public androidx.privacysandbox.ads.adservices.measurement.MeasurementManager? obtain(android.content.Context context);
+    property public static final int MEASUREMENT_API_STATE_DISABLED;
+    property public static final int MEASUREMENT_API_STATE_ENABLED;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.RegisterSourceOptIn public final class SourceRegistrationRequest {
diff --git a/privacysandbox/ads/ads-adservices/api/current.txt b/privacysandbox/ads/ads-adservices/api/current.txt
index 384ff4f..e3949b9 100644
--- a/privacysandbox/ads/ads-adservices/api/current.txt
+++ b/privacysandbox/ads/ads-adservices/api/current.txt
@@ -81,6 +81,7 @@
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final class AdSelectionOutcome.Companion {
+    property @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final class GetAdSelectionDataOutcome {
@@ -132,6 +133,8 @@
   }
 
   public static final class ReportEventRequest.Companion {
+    property public static final int FLAG_REPORTING_DESTINATION_BUYER;
+    property public static final int FLAG_REPORTING_DESTINATION_SELLER;
   }
 
   public final class ReportImpressionRequest {
@@ -169,6 +172,8 @@
   }
 
   public static final class AppSetId.Companion {
+    property public static final int SCOPE_APP;
+    property public static final int SCOPE_DEVELOPER;
   }
 
   public abstract class AppSetIdManager {
@@ -259,6 +264,10 @@
   }
 
   public static final class FrequencyCapFilters.Companion {
+    property public static final int AD_EVENT_TYPE_CLICK;
+    property public static final int AD_EVENT_TYPE_IMPRESSION;
+    property public static final int AD_EVENT_TYPE_VIEW;
+    property public static final int AD_EVENT_TYPE_WIN;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext8OptIn public final class KeyedFrequencyCap {
@@ -398,6 +407,10 @@
   }
 
   public static final class DeletionRequest.Companion {
+    property public static final int DELETION_MODE_ALL;
+    property public static final int DELETION_MODE_EXCLUDE_INTERNAL_DATA;
+    property public static final int MATCH_BEHAVIOR_DELETE;
+    property public static final int MATCH_BEHAVIOR_PRESERVE;
   }
 
   public abstract class MeasurementManager {
@@ -417,6 +430,8 @@
 
   public static final class MeasurementManager.Companion {
     method public androidx.privacysandbox.ads.adservices.measurement.MeasurementManager? obtain(android.content.Context context);
+    property public static final int MEASUREMENT_API_STATE_DISABLED;
+    property public static final int MEASUREMENT_API_STATE_ENABLED;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.RegisterSourceOptIn public final class SourceRegistrationRequest {
diff --git a/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta11.txt b/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta11.txt
index 384ff4f..e3949b9 100644
--- a/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta11.txt
+++ b/privacysandbox/ads/ads-adservices/api/restricted_1.1.0-beta11.txt
@@ -81,6 +81,7 @@
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final class AdSelectionOutcome.Companion {
+    property @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final class GetAdSelectionDataOutcome {
@@ -132,6 +133,8 @@
   }
 
   public static final class ReportEventRequest.Companion {
+    property public static final int FLAG_REPORTING_DESTINATION_BUYER;
+    property public static final int FLAG_REPORTING_DESTINATION_SELLER;
   }
 
   public final class ReportImpressionRequest {
@@ -169,6 +172,8 @@
   }
 
   public static final class AppSetId.Companion {
+    property public static final int SCOPE_APP;
+    property public static final int SCOPE_DEVELOPER;
   }
 
   public abstract class AppSetIdManager {
@@ -259,6 +264,10 @@
   }
 
   public static final class FrequencyCapFilters.Companion {
+    property public static final int AD_EVENT_TYPE_CLICK;
+    property public static final int AD_EVENT_TYPE_IMPRESSION;
+    property public static final int AD_EVENT_TYPE_VIEW;
+    property public static final int AD_EVENT_TYPE_WIN;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext8OptIn public final class KeyedFrequencyCap {
@@ -398,6 +407,10 @@
   }
 
   public static final class DeletionRequest.Companion {
+    property public static final int DELETION_MODE_ALL;
+    property public static final int DELETION_MODE_EXCLUDE_INTERNAL_DATA;
+    property public static final int MATCH_BEHAVIOR_DELETE;
+    property public static final int MATCH_BEHAVIOR_PRESERVE;
   }
 
   public abstract class MeasurementManager {
@@ -417,6 +430,8 @@
 
   public static final class MeasurementManager.Companion {
     method public androidx.privacysandbox.ads.adservices.measurement.MeasurementManager? obtain(android.content.Context context);
+    property public static final int MEASUREMENT_API_STATE_DISABLED;
+    property public static final int MEASUREMENT_API_STATE_ENABLED;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.RegisterSourceOptIn public final class SourceRegistrationRequest {
diff --git a/privacysandbox/ads/ads-adservices/api/restricted_current.txt b/privacysandbox/ads/ads-adservices/api/restricted_current.txt
index 384ff4f..e3949b9 100644
--- a/privacysandbox/ads/ads-adservices/api/restricted_current.txt
+++ b/privacysandbox/ads/ads-adservices/api/restricted_current.txt
@@ -81,6 +81,7 @@
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public static final class AdSelectionOutcome.Companion {
+    property @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final androidx.privacysandbox.ads.adservices.adselection.AdSelectionOutcome NO_OUTCOME;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext10OptIn public final class GetAdSelectionDataOutcome {
@@ -132,6 +133,8 @@
   }
 
   public static final class ReportEventRequest.Companion {
+    property public static final int FLAG_REPORTING_DESTINATION_BUYER;
+    property public static final int FLAG_REPORTING_DESTINATION_SELLER;
   }
 
   public final class ReportImpressionRequest {
@@ -169,6 +172,8 @@
   }
 
   public static final class AppSetId.Companion {
+    property public static final int SCOPE_APP;
+    property public static final int SCOPE_DEVELOPER;
   }
 
   public abstract class AppSetIdManager {
@@ -259,6 +264,10 @@
   }
 
   public static final class FrequencyCapFilters.Companion {
+    property public static final int AD_EVENT_TYPE_CLICK;
+    property public static final int AD_EVENT_TYPE_IMPRESSION;
+    property public static final int AD_EVENT_TYPE_VIEW;
+    property public static final int AD_EVENT_TYPE_WIN;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.Ext8OptIn public final class KeyedFrequencyCap {
@@ -398,6 +407,10 @@
   }
 
   public static final class DeletionRequest.Companion {
+    property public static final int DELETION_MODE_ALL;
+    property public static final int DELETION_MODE_EXCLUDE_INTERNAL_DATA;
+    property public static final int MATCH_BEHAVIOR_DELETE;
+    property public static final int MATCH_BEHAVIOR_PRESERVE;
   }
 
   public abstract class MeasurementManager {
@@ -417,6 +430,8 @@
 
   public static final class MeasurementManager.Companion {
     method public androidx.privacysandbox.ads.adservices.measurement.MeasurementManager? obtain(android.content.Context context);
+    property public static final int MEASUREMENT_API_STATE_DISABLED;
+    property public static final int MEASUREMENT_API_STATE_ENABLED;
   }
 
   @SuppressCompatibility @androidx.privacysandbox.ads.adservices.common.ExperimentalFeatures.RegisterSourceOptIn public final class SourceRegistrationRequest {
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/api/current.txt b/privacysandbox/sdkruntime/sdkruntime-core/api/current.txt
index 035e330..e6d916f 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/api/current.txt
+++ b/privacysandbox/sdkruntime/sdkruntime-core/api/current.txt
@@ -24,6 +24,12 @@
   }
 
   public static final class LoadSdkCompatException.Companion {
+    property public static final int LOAD_SDK_ALREADY_LOADED;
+    property public static final int LOAD_SDK_INTERNAL_ERROR;
+    property public static final int LOAD_SDK_NOT_FOUND;
+    property public static final int LOAD_SDK_SDK_DEFINED_ERROR;
+    property public static final int LOAD_SDK_SDK_SANDBOX_DISABLED;
+    property public static final int SDK_SANDBOX_PROCESS_NOT_AVAILABLE;
   }
 
   public final class SandboxedSdkCompat {
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/api/restricted_current.txt b/privacysandbox/sdkruntime/sdkruntime-core/api/restricted_current.txt
index 035e330..e6d916f 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/api/restricted_current.txt
+++ b/privacysandbox/sdkruntime/sdkruntime-core/api/restricted_current.txt
@@ -24,6 +24,12 @@
   }
 
   public static final class LoadSdkCompatException.Companion {
+    property public static final int LOAD_SDK_ALREADY_LOADED;
+    property public static final int LOAD_SDK_INTERNAL_ERROR;
+    property public static final int LOAD_SDK_NOT_FOUND;
+    property public static final int LOAD_SDK_SDK_DEFINED_ERROR;
+    property public static final int LOAD_SDK_SDK_SANDBOX_DISABLED;
+    property public static final int SDK_SANDBOX_PROCESS_NOT_AVAILABLE;
   }
 
   public final class SandboxedSdkCompat {
diff --git a/privacysandbox/ui/ui-core/api/current.txt b/privacysandbox/ui/ui-core/api/current.txt
index c7c6286..9c75ea5 100644
--- a/privacysandbox/ui/ui-core/api/current.txt
+++ b/privacysandbox/ui/ui-core/api/current.txt
@@ -66,6 +66,7 @@
 
   public final class SdkRuntimeUiLibVersions {
     method public int getClientVersion();
+    property public static final int apiVersion;
     property public final int clientVersion;
     field public static final androidx.privacysandbox.ui.core.SdkRuntimeUiLibVersions INSTANCE;
     field public static final int apiVersion = 1; // 0x1
diff --git a/privacysandbox/ui/ui-core/api/restricted_current.txt b/privacysandbox/ui/ui-core/api/restricted_current.txt
index c7c6286..9c75ea5 100644
--- a/privacysandbox/ui/ui-core/api/restricted_current.txt
+++ b/privacysandbox/ui/ui-core/api/restricted_current.txt
@@ -66,6 +66,7 @@
 
   public final class SdkRuntimeUiLibVersions {
     method public int getClientVersion();
+    property public static final int apiVersion;
     property public final int clientVersion;
     field public static final androidx.privacysandbox.ui.core.SdkRuntimeUiLibVersions INSTANCE;
     field public static final int apiVersion = 1; // 0x1
diff --git a/room/room-common/api/current.txt b/room/room-common/api/current.txt
index 0b88e5e..43dd4e3 100644
--- a/room/room-common/api/current.txt
+++ b/room/room-common/api/current.txt
@@ -56,6 +56,19 @@
   }
 
   public static final class ColumnInfo.Companion {
+    property public static final int BINARY;
+    property public static final int BLOB;
+    property public static final String INHERIT_FIELD_NAME;
+    property public static final int INTEGER;
+    property @RequiresApi(21) public static final int LOCALIZED;
+    property public static final int NOCASE;
+    property public static final int REAL;
+    property public static final int RTRIM;
+    property public static final int TEXT;
+    property public static final int UNDEFINED;
+    property @RequiresApi(21) public static final int UNICODE;
+    property public static final int UNSPECIFIED;
+    property public static final String VALUE_UNSPECIFIED;
     field public static final int BINARY = 2; // 0x2
     field public static final int BLOB = 5; // 0x5
     field public static final String INHERIT_FIELD_NAME = "[field-name]";
@@ -174,6 +187,11 @@
   }
 
   public static final class ForeignKey.Companion {
+    property public static final int CASCADE;
+    property public static final int NO_ACTION;
+    property public static final int RESTRICT;
+    property public static final int SET_DEFAULT;
+    property public static final int SET_NULL;
     field public static final int CASCADE = 5; // 0x5
     field public static final int NO_ACTION = 1; // 0x1
     field public static final int RESTRICT = 2; // 0x2
@@ -208,6 +226,10 @@
   }
 
   public final class FtsOptions {
+    property public static final String TOKENIZER_ICU;
+    property public static final String TOKENIZER_PORTER;
+    property public static final String TOKENIZER_SIMPLE;
+    property @RequiresApi(21) public static final String TOKENIZER_UNICODE61;
     field public static final androidx.room.FtsOptions INSTANCE;
     field public static final String TOKENIZER_ICU = "icu";
     field public static final String TOKENIZER_PORTER = "porter";
@@ -291,7 +313,11 @@
   public static final class OnConflictStrategy.Companion {
     method @Deprecated public int getFAIL();
     method @Deprecated public int getROLLBACK();
+    property public static final int ABORT;
     property @Deprecated public int FAIL;
+    property public static final int IGNORE;
+    property public static final int NONE;
+    property public static final int REPLACE;
     property @Deprecated public int ROLLBACK;
     field public static final int ABORT = 3; // 0x3
     field @Deprecated public static final int FAIL = 4; // 0x4
@@ -391,7 +417,26 @@
 
   public static final class RoomWarnings.Companion {
     method @Deprecated public String getCURSOR_MISMATCH();
+    property public static final String AMBIGUOUS_COLUMN_IN_RESULT;
+    property public static final String CANNOT_CREATE_VERIFICATION_DATABASE;
     property @Deprecated public String CURSOR_MISMATCH;
+    property public static final String DEFAULT_CONSTRUCTOR;
+    property public static final String DOES_NOT_IMPLEMENT_EQUALS_HASHCODE;
+    property public static final String INDEX_FROM_EMBEDDED_ENTITY_IS_DROPPED;
+    property public static final String INDEX_FROM_EMBEDDED_FIELD_IS_DROPPED;
+    property public static final String INDEX_FROM_PARENT_FIELD_IS_DROPPED;
+    property public static final String INDEX_FROM_PARENT_IS_DROPPED;
+    property public static final String MISMATCHED_GETTER;
+    property public static final String MISMATCHED_SETTER;
+    property public static final String MISSING_INDEX_ON_FOREIGN_KEY_CHILD;
+    property public static final String MISSING_INDEX_ON_JUNCTION;
+    property public static final String MISSING_JAVA_TMP_DIR;
+    property public static final String MISSING_SCHEMA_LOCATION;
+    property public static final String PRIMARY_KEY_FROM_EMBEDDED_IS_DROPPED;
+    property public static final String QUERY_MISMATCH;
+    property public static final String RELATION_QUERY_WITHOUT_TRANSACTION;
+    property public static final String RELATION_TYPE_MISMATCH;
+    property public static final String UNNECESSARY_NULLABILITY_IN_DAO_RETURN_TYPE;
   }
 
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS}) public @interface SkipQueryVerification {
diff --git a/room/room-common/api/restricted_current.txt b/room/room-common/api/restricted_current.txt
index ec1a6fd..d2326d6 100644
--- a/room/room-common/api/restricted_current.txt
+++ b/room/room-common/api/restricted_current.txt
@@ -62,6 +62,19 @@
   }
 
   public static final class ColumnInfo.Companion {
+    property public static final int BINARY;
+    property public static final int BLOB;
+    property public static final String INHERIT_FIELD_NAME;
+    property public static final int INTEGER;
+    property @RequiresApi(21) public static final int LOCALIZED;
+    property public static final int NOCASE;
+    property public static final int REAL;
+    property public static final int RTRIM;
+    property public static final int TEXT;
+    property public static final int UNDEFINED;
+    property @RequiresApi(21) public static final int UNICODE;
+    property public static final int UNSPECIFIED;
+    property public static final String VALUE_UNSPECIFIED;
     field public static final int BINARY = 2; // 0x2
     field public static final int BLOB = 5; // 0x5
     field public static final String INHERIT_FIELD_NAME = "[field-name]";
@@ -180,6 +193,11 @@
   }
 
   public static final class ForeignKey.Companion {
+    property public static final int CASCADE;
+    property public static final int NO_ACTION;
+    property public static final int RESTRICT;
+    property public static final int SET_DEFAULT;
+    property public static final int SET_NULL;
     field public static final int CASCADE = 5; // 0x5
     field public static final int NO_ACTION = 1; // 0x1
     field public static final int RESTRICT = 2; // 0x2
@@ -214,6 +232,10 @@
   }
 
   public final class FtsOptions {
+    property public static final String TOKENIZER_ICU;
+    property public static final String TOKENIZER_PORTER;
+    property public static final String TOKENIZER_SIMPLE;
+    property @RequiresApi(21) public static final String TOKENIZER_UNICODE61;
     field public static final androidx.room.FtsOptions INSTANCE;
     field public static final String TOKENIZER_ICU = "icu";
     field public static final String TOKENIZER_PORTER = "porter";
@@ -297,7 +319,11 @@
   public static final class OnConflictStrategy.Companion {
     method @Deprecated public int getFAIL();
     method @Deprecated public int getROLLBACK();
+    property public static final int ABORT;
     property @Deprecated public int FAIL;
+    property public static final int IGNORE;
+    property public static final int NONE;
+    property public static final int REPLACE;
     property @Deprecated public int ROLLBACK;
     field public static final int ABORT = 3; // 0x3
     field @Deprecated public static final int FAIL = 4; // 0x4
@@ -372,6 +398,11 @@
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class RoomMasterTable {
     method public static String createInsertQuery(String hash);
+    property public static final String CREATE_QUERY;
+    property public static final String DEFAULT_ID;
+    property public static final String NAME;
+    property public static final String READ_QUERY;
+    property public static final String TABLE_NAME;
     field public static final String CREATE_QUERY = "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)";
     field public static final String DEFAULT_ID = "42";
     field public static final androidx.room.RoomMasterTable INSTANCE;
@@ -407,7 +438,26 @@
 
   public static final class RoomWarnings.Companion {
     method @Deprecated public String getCURSOR_MISMATCH();
+    property public static final String AMBIGUOUS_COLUMN_IN_RESULT;
+    property public static final String CANNOT_CREATE_VERIFICATION_DATABASE;
     property @Deprecated public String CURSOR_MISMATCH;
+    property public static final String DEFAULT_CONSTRUCTOR;
+    property public static final String DOES_NOT_IMPLEMENT_EQUALS_HASHCODE;
+    property public static final String INDEX_FROM_EMBEDDED_ENTITY_IS_DROPPED;
+    property public static final String INDEX_FROM_EMBEDDED_FIELD_IS_DROPPED;
+    property public static final String INDEX_FROM_PARENT_FIELD_IS_DROPPED;
+    property public static final String INDEX_FROM_PARENT_IS_DROPPED;
+    property public static final String MISMATCHED_GETTER;
+    property public static final String MISMATCHED_SETTER;
+    property public static final String MISSING_INDEX_ON_FOREIGN_KEY_CHILD;
+    property public static final String MISSING_INDEX_ON_JUNCTION;
+    property public static final String MISSING_JAVA_TMP_DIR;
+    property public static final String MISSING_SCHEMA_LOCATION;
+    property public static final String PRIMARY_KEY_FROM_EMBEDDED_IS_DROPPED;
+    property public static final String QUERY_MISMATCH;
+    property public static final String RELATION_QUERY_WITHOUT_TRANSACTION;
+    property public static final String RELATION_TYPE_MISMATCH;
+    property public static final String UNNECESSARY_NULLABILITY_IN_DAO_RETURN_TYPE;
   }
 
   @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.CLASS}) public @interface SkipQueryVerification {
diff --git a/room/room-runtime/api/current.txt b/room/room-runtime/api/current.txt
index 7a0cb28..1125c31 100644
--- a/room/room-runtime/api/current.txt
+++ b/room/room-runtime/api/current.txt
@@ -4,6 +4,28 @@
   public class DatabaseConfiguration {
     method public boolean isMigrationRequired(int fromVersion, int toVersion);
     method @Deprecated public boolean isMigrationRequiredFrom(int version);
+    property public final boolean allowDestructiveMigrationForAllTables;
+    property public final boolean allowDestructiveMigrationOnDowngrade;
+    property public final boolean allowMainThreadQueries;
+    property public final java.util.List<? extends androidx.room.migration.AutoMigrationSpec> autoMigrationSpecs;
+    property public final java.util.List<? extends androidx.room.RoomDatabase.Callback>? callbacks;
+    property public final android.content.Context context;
+    property public final String? copyFromAssetPath;
+    property public final java.io.File? copyFromFile;
+    property public final java.util.concurrent.Callable<java.io.InputStream>? copyFromInputStream;
+    property public final androidx.room.RoomDatabase.JournalMode journalMode;
+    property public final androidx.room.RoomDatabase.MigrationContainer migrationContainer;
+    property public final boolean multiInstanceInvalidation;
+    property public final android.content.Intent? multiInstanceInvalidationServiceIntent;
+    property public final String? name;
+    property public final androidx.room.RoomDatabase.PrepackagedDatabaseCallback? prepackagedDatabaseCallback;
+    property public final kotlin.coroutines.CoroutineContext? queryCoroutineContext;
+    property public final java.util.concurrent.Executor queryExecutor;
+    property public final boolean requireMigration;
+    property public final androidx.sqlite.SQLiteDriver? sqliteDriver;
+    property public final androidx.sqlite.db.SupportSQLiteOpenHelper.Factory? sqliteOpenHelperFactory;
+    property public final java.util.concurrent.Executor transactionExecutor;
+    property public final java.util.List<?> typeConverters;
     field public final boolean allowDestructiveMigrationForAllTables;
     field public final boolean allowDestructiveMigrationOnDowngrade;
     field public final boolean allowMainThreadQueries;
@@ -62,6 +84,7 @@
     method public inline <reified T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> databaseBuilder(android.content.Context context, String name, optional kotlin.jvm.functions.Function0<? extends T> factory);
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, Class<T> klass);
     method public inline <reified T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, optional kotlin.jvm.functions.Function0<? extends T> factory);
+    property public static final String MASTER_TABLE_NAME;
     field public static final androidx.room.Room INSTANCE;
     field public static final String MASTER_TABLE_NAME = "room_master_table";
   }
@@ -229,6 +252,8 @@
     ctor public Migration(int startVersion, int endVersion);
     method public void migrate(androidx.sqlite.db.SupportSQLiteDatabase db);
     method public void migrate(androidx.sqlite.SQLiteConnection connection);
+    property public final int endVersion;
+    property public final int startVersion;
     field public final int endVersion;
     field public final int startVersion;
   }
diff --git a/room/room-runtime/api/restricted_current.txt b/room/room-runtime/api/restricted_current.txt
index ae36763..adb1160 100644
--- a/room/room-runtime/api/restricted_current.txt
+++ b/room/room-runtime/api/restricted_current.txt
@@ -27,6 +27,28 @@
     ctor @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public DatabaseConfiguration(android.content.Context context, String? name, androidx.sqlite.db.SupportSQLiteOpenHelper.Factory sqliteOpenHelperFactory, androidx.room.RoomDatabase.MigrationContainer migrationContainer, java.util.List<? extends androidx.room.RoomDatabase.Callback>? callbacks, boolean allowMainThreadQueries, androidx.room.RoomDatabase.JournalMode journalMode, java.util.concurrent.Executor queryExecutor, java.util.concurrent.Executor transactionExecutor, boolean multiInstanceInvalidation, boolean requireMigration, boolean allowDestructiveMigrationOnDowngrade, java.util.Set<java.lang.Integer>? migrationNotRequiredFrom, String? copyFromAssetPath, java.io.File? copyFromFile, java.util.concurrent.Callable<java.io.InputStream>? copyFromInputStream, androidx.room.RoomDatabase.PrepackagedDatabaseCallback? prepackagedDatabaseCallback, java.util.List<?> typeConverters, java.util.List<? extends androidx.room.migration.AutoMigrationSpec> autoMigrationSpecs);
     method public boolean isMigrationRequired(int fromVersion, int toVersion);
     method @Deprecated public boolean isMigrationRequiredFrom(int version);
+    property public final boolean allowDestructiveMigrationForAllTables;
+    property public final boolean allowDestructiveMigrationOnDowngrade;
+    property public final boolean allowMainThreadQueries;
+    property public final java.util.List<? extends androidx.room.migration.AutoMigrationSpec> autoMigrationSpecs;
+    property public final java.util.List<? extends androidx.room.RoomDatabase.Callback>? callbacks;
+    property public final android.content.Context context;
+    property public final String? copyFromAssetPath;
+    property public final java.io.File? copyFromFile;
+    property public final java.util.concurrent.Callable<java.io.InputStream>? copyFromInputStream;
+    property public final androidx.room.RoomDatabase.JournalMode journalMode;
+    property public final androidx.room.RoomDatabase.MigrationContainer migrationContainer;
+    property public final boolean multiInstanceInvalidation;
+    property public final android.content.Intent? multiInstanceInvalidationServiceIntent;
+    property public final String? name;
+    property public final androidx.room.RoomDatabase.PrepackagedDatabaseCallback? prepackagedDatabaseCallback;
+    property public final kotlin.coroutines.CoroutineContext? queryCoroutineContext;
+    property public final java.util.concurrent.Executor queryExecutor;
+    property public final boolean requireMigration;
+    property public final androidx.sqlite.SQLiteDriver? sqliteDriver;
+    property public final androidx.sqlite.db.SupportSQLiteOpenHelper.Factory? sqliteOpenHelperFactory;
+    property public final java.util.concurrent.Executor transactionExecutor;
+    property public final java.util.List<?> typeConverters;
     field public final boolean allowDestructiveMigrationForAllTables;
     field public final boolean allowDestructiveMigrationOnDowngrade;
     field public final boolean allowMainThreadQueries;
@@ -173,6 +195,7 @@
     method public inline <reified T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> databaseBuilder(android.content.Context context, String name, optional kotlin.jvm.functions.Function0<? extends T> factory);
     method public static <T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, Class<T> klass);
     method public inline <reified T extends androidx.room.RoomDatabase> androidx.room.RoomDatabase.Builder<T> inMemoryDatabaseBuilder(android.content.Context context, optional kotlin.jvm.functions.Function0<? extends T> factory);
+    property public static final String MASTER_TABLE_NAME;
     field public static final androidx.room.Room INSTANCE;
     field public static final String MASTER_TABLE_NAME = "room_master_table";
   }
@@ -264,6 +287,7 @@
   }
 
   public static final class RoomDatabase.Companion {
+    property @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final int MAX_BIND_PARAMETER_CNT;
   }
 
   public enum RoomDatabase.JournalMode {
@@ -325,11 +349,14 @@
     method @Deprecated public void onPreMigrate(androidx.sqlite.db.SupportSQLiteDatabase db);
     method @Deprecated public androidx.room.RoomOpenHelper.ValidationResult onValidateSchema(androidx.sqlite.db.SupportSQLiteDatabase db);
     method @Deprecated protected void validateMigration(androidx.sqlite.db.SupportSQLiteDatabase db);
+    property @Deprecated public final int version;
     field @Deprecated public final int version;
   }
 
   @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static class RoomOpenHelper.ValidationResult {
     ctor @Deprecated public RoomOpenHelper.ValidationResult(boolean isValid, String? expectedFoundMsg);
+    property @Deprecated public final String? expectedFoundMsg;
+    property @Deprecated public final boolean isValid;
     field @Deprecated public final String? expectedFoundMsg;
     field @Deprecated public final boolean isValid;
   }
@@ -362,8 +389,12 @@
     method public void release();
     method public androidx.room.RoomRawQuery toRoomRawQuery();
     property public int argCount;
+    property @VisibleForTesting public final byte[]?[] blobBindings;
     property public final int capacity;
+    property @VisibleForTesting public final double[] doubleBindings;
+    property @VisibleForTesting public final long[] longBindings;
     property public String sql;
+    property @VisibleForTesting public final String?[] stringBindings;
     field public static final androidx.room.RoomSQLiteQuery.Companion Companion;
     field @VisibleForTesting public static final int DESIRED_POOL_SIZE = 10; // 0xa
     field @VisibleForTesting public static final int POOL_LIMIT = 15; // 0xf
@@ -377,6 +408,9 @@
   public static final class RoomSQLiteQuery.Companion {
     method public androidx.room.RoomSQLiteQuery acquire(String query, int argumentCount);
     method public androidx.room.RoomSQLiteQuery copyFrom(androidx.sqlite.db.SupportSQLiteQuery supportSQLiteQuery);
+    property @VisibleForTesting public static final int DESIRED_POOL_SIZE;
+    property @VisibleForTesting public static final int POOL_LIMIT;
+    property @VisibleForTesting public final java.util.TreeMap<java.lang.Integer,androidx.room.RoomSQLiteQuery> queryPool;
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract class SharedSQLiteStatement {
@@ -431,6 +465,8 @@
     ctor public Migration(int startVersion, int endVersion);
     method public void migrate(androidx.sqlite.db.SupportSQLiteDatabase db);
     method public void migrate(androidx.sqlite.SQLiteConnection connection);
+    property public final int endVersion;
+    property public final int startVersion;
     field public final int endVersion;
     field public final int startVersion;
   }
@@ -459,6 +495,7 @@
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ByteArrayWrapper {
     ctor public ByteArrayWrapper(byte[] array);
+    property public final byte[] array;
     field public final byte[] array;
   }
 
@@ -494,6 +531,9 @@
     ctor public FtsTableInfo(String name, java.util.Set<java.lang.String> columns, java.util.Set<java.lang.String> options);
     method public static androidx.room.util.FtsTableInfo read(androidx.sqlite.db.SupportSQLiteDatabase database, String tableName);
     method public static androidx.room.util.FtsTableInfo read(androidx.sqlite.SQLiteConnection connection, String tableName);
+    property public final java.util.Set<? extends java.lang.String> columns;
+    property public final String name;
+    property public final java.util.Set<? extends java.lang.String> options;
     field public static final androidx.room.util.FtsTableInfo.Companion Companion;
     field public final java.util.Set<java.lang.String> columns;
     field public final String name;
@@ -542,6 +582,10 @@
     ctor public TableInfo(String name, java.util.Map<java.lang.String,androidx.room.util.TableInfo.Column> columns, java.util.Set<androidx.room.util.TableInfo.ForeignKey> foreignKeys, optional java.util.Set<androidx.room.util.TableInfo.Index>? indices);
     method @Deprecated public static androidx.room.util.TableInfo read(androidx.sqlite.db.SupportSQLiteDatabase database, String tableName);
     method public static androidx.room.util.TableInfo read(androidx.sqlite.SQLiteConnection connection, String tableName);
+    property public final java.util.Map<java.lang.String,? extends androidx.room.util.TableInfo.Column> columns;
+    property public final java.util.Set<? extends androidx.room.util.TableInfo.ForeignKey> foreignKeys;
+    property public final java.util.Set<? extends androidx.room.util.TableInfo.Index>? indices;
+    property public final String name;
     field public static final int CREATED_FROM_DATABASE = 2; // 0x2
     field public static final int CREATED_FROM_ENTITY = 1; // 0x1
     field public static final int CREATED_FROM_UNKNOWN = 0; // 0x0
@@ -557,7 +601,14 @@
     ctor public TableInfo.Column(String name, String type, boolean notNull, int primaryKeyPosition, String? defaultValue, int createdFrom);
     method public static boolean defaultValueEquals(String current, String? other);
     method public boolean isPrimaryKey();
+    property @androidx.room.ColumnInfo.SQLiteTypeAffinity public final int affinity;
+    property public final int createdFrom;
+    property public final String? defaultValue;
     property public final boolean isPrimaryKey;
+    property public final String name;
+    property public final boolean notNull;
+    property public final int primaryKeyPosition;
+    property public final String type;
     field public static final androidx.room.util.TableInfo.Column.Companion Companion;
     field @androidx.room.ColumnInfo.SQLiteTypeAffinity public final int affinity;
     field public final int createdFrom;
@@ -575,10 +626,18 @@
   public static final class TableInfo.Companion {
     method @Deprecated public androidx.room.util.TableInfo read(androidx.sqlite.db.SupportSQLiteDatabase database, String tableName);
     method public androidx.room.util.TableInfo read(androidx.sqlite.SQLiteConnection connection, String tableName);
+    property public static final int CREATED_FROM_DATABASE;
+    property public static final int CREATED_FROM_ENTITY;
+    property public static final int CREATED_FROM_UNKNOWN;
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final class TableInfo.ForeignKey {
     ctor public TableInfo.ForeignKey(String referenceTable, String onDelete, String onUpdate, java.util.List<java.lang.String> columnNames, java.util.List<java.lang.String> referenceColumnNames);
+    property public final java.util.List<? extends java.lang.String> columnNames;
+    property public final String onDelete;
+    property public final String onUpdate;
+    property public final java.util.List<? extends java.lang.String> referenceColumnNames;
+    property public final String referenceTable;
     field public final java.util.List<java.lang.String> columnNames;
     field public final String onDelete;
     field public final String onUpdate;
@@ -589,6 +648,10 @@
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final class TableInfo.Index {
     ctor @Deprecated public TableInfo.Index(String name, boolean unique, java.util.List<java.lang.String> columns);
     ctor public TableInfo.Index(String name, boolean unique, java.util.List<java.lang.String> columns, java.util.List<java.lang.String> orders);
+    property public final java.util.List<? extends java.lang.String> columns;
+    property public final String name;
+    property public final java.util.List<? extends java.lang.String> orders;
+    property public final boolean unique;
     field public static final androidx.room.util.TableInfo.Index.Companion Companion;
     field public static final String DEFAULT_PREFIX = "index_";
     field public final java.util.List<java.lang.String> columns;
@@ -598,6 +661,7 @@
   }
 
   public static final class TableInfo.Index.Companion {
+    property public static final String DEFAULT_PREFIX;
   }
 
   @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX}) public final class UUIDUtil {
@@ -609,6 +673,8 @@
     ctor public ViewInfo(String name, String? sql);
     method @Deprecated public static androidx.room.util.ViewInfo read(androidx.sqlite.db.SupportSQLiteDatabase database, String viewName);
     method public static androidx.room.util.ViewInfo read(androidx.sqlite.SQLiteConnection connection, String viewName);
+    property public final String name;
+    property public final String? sql;
     field public static final androidx.room.util.ViewInfo.Companion Companion;
     field public final String name;
     field public final String? sql;
diff --git a/room/room-rxjava2/api/current.txt b/room/room-rxjava2/api/current.txt
index 4df9b3d..5749ea3 100644
--- a/room/room-rxjava2/api/current.txt
+++ b/room/room-rxjava2/api/current.txt
@@ -16,6 +16,7 @@
   public static final class RxRoom.Companion {
     method public io.reactivex.Flowable<java.lang.Object> createFlowable(androidx.room.RoomDatabase database, java.lang.String... tableNames);
     method public io.reactivex.Observable<java.lang.Object> createObservable(androidx.room.RoomDatabase database, java.lang.String... tableNames);
+    property public final Object NOTHING;
   }
 
 }
diff --git a/room/room-rxjava2/api/restricted_current.txt b/room/room-rxjava2/api/restricted_current.txt
index 9a2d59c..9bb653e2 100644
--- a/room/room-rxjava2/api/restricted_current.txt
+++ b/room/room-rxjava2/api/restricted_current.txt
@@ -36,6 +36,7 @@
     method @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public <T> io.reactivex.Observable<T> createObservable(androidx.room.RoomDatabase database, String[] tableNames, java.util.concurrent.Callable<? extends T> callable);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public <T> io.reactivex.Single<T> createSingle(androidx.room.RoomDatabase db, boolean isReadOnly, boolean inTransaction, kotlin.jvm.functions.Function1<? super androidx.sqlite.SQLiteConnection,? extends T?> block);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public <T> io.reactivex.Single<T> createSingle(java.util.concurrent.Callable<? extends T> callable);
+    property public final Object NOTHING;
   }
 
 }
diff --git a/room/room-rxjava3/api/current.txt b/room/room-rxjava3/api/current.txt
index bbddba6..54a765f 100644
--- a/room/room-rxjava3/api/current.txt
+++ b/room/room-rxjava3/api/current.txt
@@ -8,6 +8,7 @@
   public final class RxRoom {
     method public static io.reactivex.rxjava3.core.Flowable<java.lang.Object> createFlowable(androidx.room.RoomDatabase database, java.lang.String... tableNames);
     method public static io.reactivex.rxjava3.core.Observable<java.lang.Object> createObservable(androidx.room.RoomDatabase database, java.lang.String... tableNames);
+    property public final Object NOTHING;
     field public static final Object NOTHING;
   }
 
diff --git a/room/room-rxjava3/api/restricted_current.txt b/room/room-rxjava3/api/restricted_current.txt
index 9b71011..98cabc5 100644
--- a/room/room-rxjava3/api/restricted_current.txt
+++ b/room/room-rxjava3/api/restricted_current.txt
@@ -16,6 +16,7 @@
     method public static io.reactivex.rxjava3.core.Observable<java.lang.Object> createObservable(androidx.room.RoomDatabase database, java.lang.String... tableNames);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static <T> io.reactivex.rxjava3.core.Single<T> createSingle(androidx.room.RoomDatabase db, boolean isReadOnly, boolean inTransaction, kotlin.jvm.functions.Function1<? super androidx.sqlite.SQLiteConnection,? extends T?> block);
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static <T> io.reactivex.rxjava3.core.Single<T> createSingle(java.util.concurrent.Callable<? extends T> callable);
+    property public final Object NOTHING;
     field public static final Object NOTHING;
   }
 
diff --git a/savedstate/savedstate/api/restricted_current.txt b/savedstate/savedstate/api/restricted_current.txt
index a724267..f446477 100644
--- a/savedstate/savedstate/api/restricted_current.txt
+++ b/savedstate/savedstate/api/restricted_current.txt
@@ -152,6 +152,12 @@
   @kotlin.PublishedApi internal final class SavedStateUtils {
     method public inline <reified T> T getValueFromSavedState(String key, kotlin.jvm.functions.Function0<? extends T?> currentValue, kotlin.jvm.functions.Function1<? super java.lang.String,java.lang.Boolean> contains, kotlin.jvm.functions.Function0<? extends T> defaultValue);
     method public inline Void keyNotFoundError(String key);
+    property public static final boolean DEFAULT_BOOLEAN;
+    property public static final char DEFAULT_CHAR;
+    property public static final double DEFAULT_DOUBLE;
+    property public static final float DEFAULT_FLOAT;
+    property public static final int DEFAULT_INT;
+    property public static final long DEFAULT_LONG;
     field public static final boolean DEFAULT_BOOLEAN = false;
     field public static final char DEFAULT_CHAR = 0; // 0x0000 '\u0000'
     field public static final double DEFAULT_DOUBLE = 0.0;
diff --git a/security/security-state/api/current.txt b/security/security-state/api/current.txt
index 7f6c944..cf6108e 100644
--- a/security/security-state/api/current.txt
+++ b/security/security-state/api/current.txt
@@ -25,6 +25,11 @@
   }
 
   public static final class SecurityPatchState.Companion {
+    property public static final String COMPONENT_KERNEL;
+    property public static final String COMPONENT_SYSTEM;
+    property public static final String COMPONENT_SYSTEM_MODULES;
+    property public final java.util.List<? extends java.lang.String> DEFAULT_SYSTEM_MODULES;
+    property public static final String DEFAULT_VULNERABILITY_REPORTS_URL;
   }
 
   public static final class SecurityPatchState.DateBasedSecurityPatchLevel extends androidx.security.state.SecurityPatchState.SecurityPatchLevel {
@@ -83,6 +88,9 @@
   }
 
   public static final class SecurityStateManager.Companion {
+    property public static final String KEY_KERNEL_VERSION;
+    property public static final String KEY_SYSTEM_SPL;
+    property public static final String KEY_VENDOR_SPL;
   }
 
   public final class UpdateInfo {
diff --git a/security/security-state/api/restricted_current.txt b/security/security-state/api/restricted_current.txt
index 7f6c944..cf6108e 100644
--- a/security/security-state/api/restricted_current.txt
+++ b/security/security-state/api/restricted_current.txt
@@ -25,6 +25,11 @@
   }
 
   public static final class SecurityPatchState.Companion {
+    property public static final String COMPONENT_KERNEL;
+    property public static final String COMPONENT_SYSTEM;
+    property public static final String COMPONENT_SYSTEM_MODULES;
+    property public final java.util.List<? extends java.lang.String> DEFAULT_SYSTEM_MODULES;
+    property public static final String DEFAULT_VULNERABILITY_REPORTS_URL;
   }
 
   public static final class SecurityPatchState.DateBasedSecurityPatchLevel extends androidx.security.state.SecurityPatchState.SecurityPatchLevel {
@@ -83,6 +88,9 @@
   }
 
   public static final class SecurityStateManager.Companion {
+    property public static final String KEY_KERNEL_VERSION;
+    property public static final String KEY_SYSTEM_SPL;
+    property public static final String KEY_VENDOR_SPL;
   }
 
   public final class UpdateInfo {
diff --git a/slidingpanelayout/slidingpanelayout/api/current.txt b/slidingpanelayout/slidingpanelayout/api/current.txt
index 4e18963..e49a46f 100644
--- a/slidingpanelayout/slidingpanelayout/api/current.txt
+++ b/slidingpanelayout/slidingpanelayout/api/current.txt
@@ -72,6 +72,13 @@
   }
 
   public static final class SlidingPaneLayout.Companion {
+    property public static final int LOCK_MODE_LOCKED;
+    property public static final int LOCK_MODE_LOCKED_CLOSED;
+    property public static final int LOCK_MODE_LOCKED_OPEN;
+    property public static final int LOCK_MODE_UNLOCKED;
+    property public static final int SPLIT_DIVIDER_POSITION_AUTO;
+    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout.UserResizeBehavior USER_RESIZE_RELAYOUT_WHEN_COMPLETE;
+    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout.UserResizeBehavior USER_RESIZE_RELAYOUT_WHEN_MOVED;
   }
 
   public static class SlidingPaneLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
@@ -81,6 +88,7 @@
     ctor public SlidingPaneLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams source);
     ctor public SlidingPaneLayout.LayoutParams(androidx.slidingpanelayout.widget.SlidingPaneLayout.LayoutParams source);
     ctor public SlidingPaneLayout.LayoutParams(int width, int height);
+    property public final float weight;
     field public float weight;
   }
 
diff --git a/slidingpanelayout/slidingpanelayout/api/restricted_current.txt b/slidingpanelayout/slidingpanelayout/api/restricted_current.txt
index 4e18963..e49a46f 100644
--- a/slidingpanelayout/slidingpanelayout/api/restricted_current.txt
+++ b/slidingpanelayout/slidingpanelayout/api/restricted_current.txt
@@ -72,6 +72,13 @@
   }
 
   public static final class SlidingPaneLayout.Companion {
+    property public static final int LOCK_MODE_LOCKED;
+    property public static final int LOCK_MODE_LOCKED_CLOSED;
+    property public static final int LOCK_MODE_LOCKED_OPEN;
+    property public static final int LOCK_MODE_UNLOCKED;
+    property public static final int SPLIT_DIVIDER_POSITION_AUTO;
+    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout.UserResizeBehavior USER_RESIZE_RELAYOUT_WHEN_COMPLETE;
+    property public final androidx.slidingpanelayout.widget.SlidingPaneLayout.UserResizeBehavior USER_RESIZE_RELAYOUT_WHEN_MOVED;
   }
 
   public static class SlidingPaneLayout.LayoutParams extends android.view.ViewGroup.MarginLayoutParams {
@@ -81,6 +88,7 @@
     ctor public SlidingPaneLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams source);
     ctor public SlidingPaneLayout.LayoutParams(androidx.slidingpanelayout.widget.SlidingPaneLayout.LayoutParams source);
     ctor public SlidingPaneLayout.LayoutParams(int width, int height);
+    property public final float weight;
     field public float weight;
   }
 
diff --git a/sqlite/sqlite-bundled/api/current.txt b/sqlite/sqlite-bundled/api/current.txt
index f739ac9..24c5948 100644
--- a/sqlite/sqlite-bundled/api/current.txt
+++ b/sqlite/sqlite-bundled/api/current.txt
@@ -2,6 +2,15 @@
 package androidx.sqlite.driver.bundled {
 
   public final class BundledSQLite {
+    property public static final int SQLITE_OPEN_CREATE;
+    property public static final int SQLITE_OPEN_EXRESCODE;
+    property public static final int SQLITE_OPEN_FULLMUTEX;
+    property public static final int SQLITE_OPEN_MEMORY;
+    property public static final int SQLITE_OPEN_NOFOLLOW;
+    property public static final int SQLITE_OPEN_NOMUTEX;
+    property public static final int SQLITE_OPEN_READONLY;
+    property public static final int SQLITE_OPEN_READWRITE;
+    property public static final int SQLITE_OPEN_URI;
     field public static final int SQLITE_OPEN_CREATE = 4; // 0x4
     field public static final int SQLITE_OPEN_EXRESCODE = 33554432; // 0x2000000
     field public static final int SQLITE_OPEN_FULLMUTEX = 65536; // 0x10000
diff --git a/sqlite/sqlite-bundled/api/restricted_current.txt b/sqlite/sqlite-bundled/api/restricted_current.txt
index 1407e9c..1468b9f 100644
--- a/sqlite/sqlite-bundled/api/restricted_current.txt
+++ b/sqlite/sqlite-bundled/api/restricted_current.txt
@@ -2,6 +2,15 @@
 package androidx.sqlite.driver.bundled {
 
   public final class BundledSQLite {
+    property public static final int SQLITE_OPEN_CREATE;
+    property public static final int SQLITE_OPEN_EXRESCODE;
+    property public static final int SQLITE_OPEN_FULLMUTEX;
+    property public static final int SQLITE_OPEN_MEMORY;
+    property public static final int SQLITE_OPEN_NOFOLLOW;
+    property public static final int SQLITE_OPEN_NOMUTEX;
+    property public static final int SQLITE_OPEN_READONLY;
+    property public static final int SQLITE_OPEN_READWRITE;
+    property public static final int SQLITE_OPEN_URI;
     field public static final int SQLITE_OPEN_CREATE = 4; // 0x4
     field public static final int SQLITE_OPEN_EXRESCODE = 33554432; // 0x2000000
     field public static final int SQLITE_OPEN_FULLMUTEX = 65536; // 0x10000
diff --git a/sqlite/sqlite/api/current.txt b/sqlite/sqlite/api/current.txt
index d7528b2..91939bd 100644
--- a/sqlite/sqlite/api/current.txt
+++ b/sqlite/sqlite/api/current.txt
@@ -8,6 +8,11 @@
     method public static void execSQL(androidx.sqlite.SQLiteConnection, String sql);
     method public static Void throwSQLiteException(int errorCode, String? errorMsg);
     method public static inline <R> R use(androidx.sqlite.SQLiteStatement, kotlin.jvm.functions.Function1<? super androidx.sqlite.SQLiteStatement,? extends R> block);
+    property public static final int SQLITE_DATA_BLOB;
+    property public static final int SQLITE_DATA_FLOAT;
+    property public static final int SQLITE_DATA_INTEGER;
+    property public static final int SQLITE_DATA_NULL;
+    property public static final int SQLITE_DATA_TEXT;
     field public static final int SQLITE_DATA_BLOB = 4; // 0x4
     field public static final int SQLITE_DATA_FLOAT = 2; // 0x2
     field public static final int SQLITE_DATA_INTEGER = 1; // 0x1
@@ -146,12 +151,18 @@
     method public void onDowngrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
     method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase db);
     method public abstract void onUpgrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
+    property public final int version;
     field public final int version;
   }
 
   public static final class SupportSQLiteOpenHelper.Configuration {
     ctor public SupportSQLiteOpenHelper.Configuration(android.content.Context context, String? name, androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback, optional boolean useNoBackupDirectory, optional boolean allowDataLossOnRecovery);
     method public static androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder builder(android.content.Context context);
+    property public final boolean allowDataLossOnRecovery;
+    property public final androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback;
+    property public final android.content.Context context;
+    property public final String? name;
+    property public final boolean useNoBackupDirectory;
     field public static final androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Companion Companion;
     field public final boolean allowDataLossOnRecovery;
     field public final androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback;
diff --git a/sqlite/sqlite/api/restricted_current.txt b/sqlite/sqlite/api/restricted_current.txt
index d7528b2..91939bd 100644
--- a/sqlite/sqlite/api/restricted_current.txt
+++ b/sqlite/sqlite/api/restricted_current.txt
@@ -8,6 +8,11 @@
     method public static void execSQL(androidx.sqlite.SQLiteConnection, String sql);
     method public static Void throwSQLiteException(int errorCode, String? errorMsg);
     method public static inline <R> R use(androidx.sqlite.SQLiteStatement, kotlin.jvm.functions.Function1<? super androidx.sqlite.SQLiteStatement,? extends R> block);
+    property public static final int SQLITE_DATA_BLOB;
+    property public static final int SQLITE_DATA_FLOAT;
+    property public static final int SQLITE_DATA_INTEGER;
+    property public static final int SQLITE_DATA_NULL;
+    property public static final int SQLITE_DATA_TEXT;
     field public static final int SQLITE_DATA_BLOB = 4; // 0x4
     field public static final int SQLITE_DATA_FLOAT = 2; // 0x2
     field public static final int SQLITE_DATA_INTEGER = 1; // 0x1
@@ -146,12 +151,18 @@
     method public void onDowngrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
     method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase db);
     method public abstract void onUpgrade(androidx.sqlite.db.SupportSQLiteDatabase db, int oldVersion, int newVersion);
+    property public final int version;
     field public final int version;
   }
 
   public static final class SupportSQLiteOpenHelper.Configuration {
     ctor public SupportSQLiteOpenHelper.Configuration(android.content.Context context, String? name, androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback, optional boolean useNoBackupDirectory, optional boolean allowDataLossOnRecovery);
     method public static androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder builder(android.content.Context context);
+    property public final boolean allowDataLossOnRecovery;
+    property public final androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback;
+    property public final android.content.Context context;
+    property public final String? name;
+    property public final boolean useNoBackupDirectory;
     field public static final androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Companion Companion;
     field public final boolean allowDataLossOnRecovery;
     field public final androidx.sqlite.db.SupportSQLiteOpenHelper.Callback callback;
diff --git a/tracing/tracing-perfetto-handshake/api/current.txt b/tracing/tracing-perfetto-handshake/api/current.txt
index db66f59..092cf27 100644
--- a/tracing/tracing-perfetto-handshake/api/current.txt
+++ b/tracing/tracing-perfetto-handshake/api/current.txt
@@ -35,6 +35,13 @@
   }
 
   public final class ResponseResultCodes {
+    property public static final int RESULT_CODE_ALREADY_ENABLED;
+    property public static final int RESULT_CODE_CANCELLED;
+    property public static final int RESULT_CODE_ERROR_BINARY_MISSING;
+    property public static final int RESULT_CODE_ERROR_BINARY_VERIFICATION_ERROR;
+    property public static final int RESULT_CODE_ERROR_BINARY_VERSION_MISMATCH;
+    property public static final int RESULT_CODE_ERROR_OTHER;
+    property public static final int RESULT_CODE_SUCCESS;
     field public static final androidx.tracing.perfetto.handshake.protocol.ResponseResultCodes INSTANCE;
     field public static final int RESULT_CODE_ALREADY_ENABLED = 2; // 0x2
     field public static final int RESULT_CODE_CANCELLED = 0; // 0x0
diff --git a/tracing/tracing-perfetto-handshake/api/restricted_current.txt b/tracing/tracing-perfetto-handshake/api/restricted_current.txt
index db66f59..092cf27 100644
--- a/tracing/tracing-perfetto-handshake/api/restricted_current.txt
+++ b/tracing/tracing-perfetto-handshake/api/restricted_current.txt
@@ -35,6 +35,13 @@
   }
 
   public final class ResponseResultCodes {
+    property public static final int RESULT_CODE_ALREADY_ENABLED;
+    property public static final int RESULT_CODE_CANCELLED;
+    property public static final int RESULT_CODE_ERROR_BINARY_MISSING;
+    property public static final int RESULT_CODE_ERROR_BINARY_VERIFICATION_ERROR;
+    property public static final int RESULT_CODE_ERROR_BINARY_VERSION_MISMATCH;
+    property public static final int RESULT_CODE_ERROR_OTHER;
+    property public static final int RESULT_CODE_SUCCESS;
     field public static final androidx.tracing.perfetto.handshake.protocol.ResponseResultCodes INSTANCE;
     field public static final int RESULT_CODE_ALREADY_ENABLED = 2; // 0x2
     field public static final int RESULT_CODE_CANCELLED = 0; // 0x0
diff --git a/tv/tv-material/api/current.txt b/tv/tv-material/api/current.txt
index b9d3ca0..4964e03 100644
--- a/tv/tv-material/api/current.txt
+++ b/tv/tv-material/api/current.txt
@@ -103,7 +103,10 @@
     method public androidx.tv.material3.CardGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
     method public androidx.tv.material3.CardScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale);
     method public androidx.tv.material3.CardShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape);
+    property public static final float HorizontalImageAspectRatio;
     property public final androidx.compose.ui.graphics.Brush ScrimBrush;
+    property public static final float SquareImageAspectRatio;
+    property public static final float VerticalImageAspectRatio;
     field public static final float HorizontalImageAspectRatio = 1.7777778f;
     field public static final androidx.tv.material3.CardDefaults INSTANCE;
     field public static final float SquareImageAspectRatio = 1.0f;
@@ -135,6 +138,7 @@
   @SuppressCompatibility @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
     method @androidx.compose.runtime.Composable public void IndicatorRow(int itemCount, int activeItemIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
     method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
+    property public static final long TimeToDisplayItemMillis;
     property @androidx.compose.runtime.Composable public final androidx.compose.animation.ContentTransform contentTransform;
     field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
     field public static final long TimeToDisplayItemMillis = 5000L; // 0x1388L
diff --git a/tv/tv-material/api/restricted_current.txt b/tv/tv-material/api/restricted_current.txt
index b9d3ca0..4964e03 100644
--- a/tv/tv-material/api/restricted_current.txt
+++ b/tv/tv-material/api/restricted_current.txt
@@ -103,7 +103,10 @@
     method public androidx.tv.material3.CardGlow glow(optional androidx.tv.material3.Glow glow, optional androidx.tv.material3.Glow focusedGlow, optional androidx.tv.material3.Glow pressedGlow);
     method public androidx.tv.material3.CardScale scale(optional @FloatRange(from=0.0) float scale, optional @FloatRange(from=0.0) float focusedScale, optional @FloatRange(from=0.0) float pressedScale);
     method public androidx.tv.material3.CardShape shape(optional androidx.compose.ui.graphics.Shape shape, optional androidx.compose.ui.graphics.Shape focusedShape, optional androidx.compose.ui.graphics.Shape pressedShape);
+    property public static final float HorizontalImageAspectRatio;
     property public final androidx.compose.ui.graphics.Brush ScrimBrush;
+    property public static final float SquareImageAspectRatio;
+    property public static final float VerticalImageAspectRatio;
     field public static final float HorizontalImageAspectRatio = 1.7777778f;
     field public static final androidx.tv.material3.CardDefaults INSTANCE;
     field public static final float SquareImageAspectRatio = 1.0f;
@@ -135,6 +138,7 @@
   @SuppressCompatibility @androidx.tv.material3.ExperimentalTvMaterial3Api public final class CarouselDefaults {
     method @androidx.compose.runtime.Composable public void IndicatorRow(int itemCount, int activeItemIndex, optional androidx.compose.ui.Modifier modifier, optional float spacing, optional kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> indicator);
     method @androidx.compose.runtime.Composable public androidx.compose.animation.ContentTransform getContentTransform();
+    property public static final long TimeToDisplayItemMillis;
     property @androidx.compose.runtime.Composable public final androidx.compose.animation.ContentTransform contentTransform;
     field public static final androidx.tv.material3.CarouselDefaults INSTANCE;
     field public static final long TimeToDisplayItemMillis = 5000L; // 0x1388L
diff --git a/wear/compose/compose-foundation/api/current.txt b/wear/compose/compose-foundation/api/current.txt
index 756dd1e..582ca7a 100644
--- a/wear/compose/compose-foundation/api/current.txt
+++ b/wear/compose/compose-foundation/api/current.txt
@@ -529,6 +529,8 @@
     method public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? getScrollProgress(androidx.compose.ui.graphics.drawscope.DrawScope);
     method public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? getScrollProgress(androidx.compose.ui.graphics.GraphicsLayerScope);
     method public androidx.compose.ui.Modifier transformedHeight(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress,java.lang.Integer> heightProvider);
+    property public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? scrollProgress;
+    property public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? scrollProgress;
   }
 
   @kotlin.jvm.JvmInline public final value class TransformingLazyColumnItemScrollProgress {
@@ -607,6 +609,8 @@
 
   public final class PagerDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.TargetedFlingBehavior snapFlingBehavior(androidx.wear.compose.foundation.pager.PagerState state, optional androidx.compose.foundation.pager.PagerSnapDistance pagerSnapDistance, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional @FloatRange(from=0.0, to=1.0) float snapPositionalThreshold);
+    property public static final int BeyondViewportPageCount;
+    property public static final float SwipeToDismissEdgeZoneFraction;
     field public static final int BeyondViewportPageCount = 0; // 0x0
     field public static final androidx.wear.compose.foundation.pager.PagerDefaults INSTANCE;
     field public static final float SwipeToDismissEdgeZoneFraction = 0.15f;
diff --git a/wear/compose/compose-foundation/api/restricted_current.txt b/wear/compose/compose-foundation/api/restricted_current.txt
index 756dd1e..582ca7a 100644
--- a/wear/compose/compose-foundation/api/restricted_current.txt
+++ b/wear/compose/compose-foundation/api/restricted_current.txt
@@ -529,6 +529,8 @@
     method public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? getScrollProgress(androidx.compose.ui.graphics.drawscope.DrawScope);
     method public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? getScrollProgress(androidx.compose.ui.graphics.GraphicsLayerScope);
     method public androidx.compose.ui.Modifier transformedHeight(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress,java.lang.Integer> heightProvider);
+    property public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? scrollProgress;
+    property public androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScrollProgress? scrollProgress;
   }
 
   @kotlin.jvm.JvmInline public final value class TransformingLazyColumnItemScrollProgress {
@@ -607,6 +609,8 @@
 
   public final class PagerDefaults {
     method @androidx.compose.runtime.Composable public androidx.compose.foundation.gestures.TargetedFlingBehavior snapFlingBehavior(androidx.wear.compose.foundation.pager.PagerState state, optional androidx.compose.foundation.pager.PagerSnapDistance pagerSnapDistance, optional androidx.compose.animation.core.DecayAnimationSpec<java.lang.Float> decayAnimationSpec, optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> snapAnimationSpec, optional @FloatRange(from=0.0, to=1.0) float snapPositionalThreshold);
+    property public static final int BeyondViewportPageCount;
+    property public static final float SwipeToDismissEdgeZoneFraction;
     field public static final int BeyondViewportPageCount = 0; // 0x0
     field public static final androidx.wear.compose.foundation.pager.PagerDefaults INSTANCE;
     field public static final float SwipeToDismissEdgeZoneFraction = 0.15f;
diff --git a/wear/compose/compose-material/api/current.txt b/wear/compose/compose-material/api/current.txt
index b24313c..15943ea 100644
--- a/wear/compose/compose-material/api/current.txt
+++ b/wear/compose/compose-material/api/current.txt
@@ -793,6 +793,8 @@
     method public float getVelocityThreshold();
     method public androidx.wear.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
     property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property public static final float StandardResistanceFactor;
+    property public static final float StiffResistanceFactor;
     property public final float VelocityThreshold;
     field public static final androidx.wear.compose.material.SwipeableDefaults INSTANCE;
     field public static final float StandardResistanceFactor = 10.0f;
@@ -867,6 +869,8 @@
     method public androidx.wear.compose.material.TimeSource timeSource(String timeFormat);
     method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
     property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public static final String TimeFormat12Hours;
+    property public static final String TimeFormat24Hours;
     field public static final androidx.wear.compose.material.TimeTextDefaults INSTANCE;
     field public static final String TimeFormat12Hours = "h:mm";
     field public static final String TimeFormat24Hours = "HH:mm";
diff --git a/wear/compose/compose-material/api/restricted_current.txt b/wear/compose/compose-material/api/restricted_current.txt
index b24313c..15943ea 100644
--- a/wear/compose/compose-material/api/restricted_current.txt
+++ b/wear/compose/compose-material/api/restricted_current.txt
@@ -793,6 +793,8 @@
     method public float getVelocityThreshold();
     method public androidx.wear.compose.material.ResistanceConfig? resistanceConfig(java.util.Set<java.lang.Float> anchors, optional float factorAtMin, optional float factorAtMax);
     property public final androidx.compose.animation.core.SpringSpec<java.lang.Float> AnimationSpec;
+    property public static final float StandardResistanceFactor;
+    property public static final float StiffResistanceFactor;
     property public final float VelocityThreshold;
     field public static final androidx.wear.compose.material.SwipeableDefaults INSTANCE;
     field public static final float StandardResistanceFactor = 10.0f;
@@ -867,6 +869,8 @@
     method public androidx.wear.compose.material.TimeSource timeSource(String timeFormat);
     method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
     property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public static final String TimeFormat12Hours;
+    property public static final String TimeFormat24Hours;
     field public static final androidx.wear.compose.material.TimeTextDefaults INSTANCE;
     field public static final String TimeFormat12Hours = "h:mm";
     field public static final String TimeFormat24Hours = "HH:mm";
diff --git a/wear/compose/compose-material3/api/current.txt b/wear/compose/compose-material3/api/current.txt
index 178be84..aea3609 100644
--- a/wear/compose/compose-material3/api/current.txt
+++ b/wear/compose/compose-material3/api/current.txt
@@ -39,6 +39,7 @@
   }
 
   @RequiresApi(31) public final class AnimatedTextDefaults {
+    property public static final int CacheSize;
     field public static final int CacheSize = 5; // 0x5
     field public static final androidx.wear.compose.material3.AnimatedTextDefaults INSTANCE;
   }
@@ -60,6 +61,8 @@
     method public float calculateRecommendedGapSize(float strokeWidth);
     method public float getIndeterminateStrokeWidth();
     method @androidx.compose.runtime.Composable public float getRecommendedIndeterminateDiameter();
+    property public static final float IndeterminateEndAngle;
+    property public static final float IndeterminateStartAngle;
     property public final float IndeterminateStrokeWidth;
     property @androidx.compose.runtime.Composable public final float recommendedIndeterminateDiameter;
     field public static final androidx.wear.compose.material3.ArcProgressIndicatorDefaults INSTANCE;
@@ -404,6 +407,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ConfirmationColors successColors();
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ConfirmationColors successColors(optional long iconColor, optional long iconContainerColor, optional long textColor);
     method @androidx.compose.runtime.Composable public kotlin.jvm.functions.Function1<androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> successText();
+    property public static final long ConfirmationDurationMillis;
     property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> FailureIcon;
     property public final float IconSize;
     property public final float SmallIconSize;
@@ -426,6 +430,8 @@
 
   public final class CurvedTextDefaults {
     method @androidx.compose.runtime.Composable public long backgroundColor();
+    property public static final float ScrollableContentMaxSweepAngle;
+    property public static final float StaticContentMaxSweepAngle;
     field public static final androidx.wear.compose.material3.CurvedTextDefaults INSTANCE;
     field public static final float ScrollableContentMaxSweepAngle = 70.0f;
     field public static final float StaticContentMaxSweepAngle = 120.0f;
@@ -674,6 +680,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.LevelIndicatorColors colors(optional long indicatorColor, optional long trackColor, optional long disabledIndicatorColor, optional long disabledTrackColor);
     method public float getStrokeWidth();
     property public final float StrokeWidth;
+    property public static final float SweepAngle;
     field public static final androidx.wear.compose.material3.LevelIndicatorDefaults INSTANCE;
     field public static final float SweepAngle = 72.0f;
   }
@@ -763,6 +770,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.OpenOnPhoneDialogColors colors(optional long iconColor, optional long iconContainerColor, optional long progressIndicatorColor, optional long progressTrackColor, optional long textColor);
     method @androidx.compose.runtime.Composable public kotlin.jvm.functions.Function1<androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> curvedText(optional String text, optional androidx.wear.compose.foundation.CurvedTextStyle style);
     method public kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> getOpenOnPhoneIcon();
+    property public static final long DurationMillis;
     property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> OpenOnPhoneIcon;
     field public static final long DurationMillis = 4000L; // 0xfa0L
     field public static final androidx.wear.compose.material3.OpenOnPhoneDialogDefaults INSTANCE;
@@ -1474,6 +1482,7 @@
   public final class TextConfigurationDefaults {
     method public int getOverflow();
     method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    property public static final int MaxLines;
     property public final int Overflow;
     property public final androidx.compose.ui.text.style.TextAlign? TextAlign;
     field public static final androidx.wear.compose.material3.TextConfigurationDefaults INSTANCE;
@@ -1607,6 +1616,9 @@
     method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
     property public final float AutoTextWeight;
     property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public static final float MaxSweepAngle;
+    property public static final String TimeFormat12Hours;
+    property public static final String TimeFormat24Hours;
     field public static final androidx.wear.compose.material3.TimeTextDefaults INSTANCE;
     field public static final float MaxSweepAngle = 70.0f;
     field public static final String TimeFormat12Hours = "h:mm";
diff --git a/wear/compose/compose-material3/api/restricted_current.txt b/wear/compose/compose-material3/api/restricted_current.txt
index 178be84..aea3609 100644
--- a/wear/compose/compose-material3/api/restricted_current.txt
+++ b/wear/compose/compose-material3/api/restricted_current.txt
@@ -39,6 +39,7 @@
   }
 
   @RequiresApi(31) public final class AnimatedTextDefaults {
+    property public static final int CacheSize;
     field public static final int CacheSize = 5; // 0x5
     field public static final androidx.wear.compose.material3.AnimatedTextDefaults INSTANCE;
   }
@@ -60,6 +61,8 @@
     method public float calculateRecommendedGapSize(float strokeWidth);
     method public float getIndeterminateStrokeWidth();
     method @androidx.compose.runtime.Composable public float getRecommendedIndeterminateDiameter();
+    property public static final float IndeterminateEndAngle;
+    property public static final float IndeterminateStartAngle;
     property public final float IndeterminateStrokeWidth;
     property @androidx.compose.runtime.Composable public final float recommendedIndeterminateDiameter;
     field public static final androidx.wear.compose.material3.ArcProgressIndicatorDefaults INSTANCE;
@@ -404,6 +407,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ConfirmationColors successColors();
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.ConfirmationColors successColors(optional long iconColor, optional long iconContainerColor, optional long textColor);
     method @androidx.compose.runtime.Composable public kotlin.jvm.functions.Function1<androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> successText();
+    property public static final long ConfirmationDurationMillis;
     property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> FailureIcon;
     property public final float IconSize;
     property public final float SmallIconSize;
@@ -426,6 +430,8 @@
 
   public final class CurvedTextDefaults {
     method @androidx.compose.runtime.Composable public long backgroundColor();
+    property public static final float ScrollableContentMaxSweepAngle;
+    property public static final float StaticContentMaxSweepAngle;
     field public static final androidx.wear.compose.material3.CurvedTextDefaults INSTANCE;
     field public static final float ScrollableContentMaxSweepAngle = 70.0f;
     field public static final float StaticContentMaxSweepAngle = 120.0f;
@@ -674,6 +680,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.LevelIndicatorColors colors(optional long indicatorColor, optional long trackColor, optional long disabledIndicatorColor, optional long disabledTrackColor);
     method public float getStrokeWidth();
     property public final float StrokeWidth;
+    property public static final float SweepAngle;
     field public static final androidx.wear.compose.material3.LevelIndicatorDefaults INSTANCE;
     field public static final float SweepAngle = 72.0f;
   }
@@ -763,6 +770,7 @@
     method @androidx.compose.runtime.Composable public androidx.wear.compose.material3.OpenOnPhoneDialogColors colors(optional long iconColor, optional long iconContainerColor, optional long progressIndicatorColor, optional long progressTrackColor, optional long textColor);
     method @androidx.compose.runtime.Composable public kotlin.jvm.functions.Function1<androidx.wear.compose.foundation.CurvedScope,kotlin.Unit> curvedText(optional String text, optional androidx.wear.compose.foundation.CurvedTextStyle style);
     method public kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> getOpenOnPhoneIcon();
+    property public static final long DurationMillis;
     property public final kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.BoxScope,kotlin.Unit> OpenOnPhoneIcon;
     field public static final long DurationMillis = 4000L; // 0xfa0L
     field public static final androidx.wear.compose.material3.OpenOnPhoneDialogDefaults INSTANCE;
@@ -1474,6 +1482,7 @@
   public final class TextConfigurationDefaults {
     method public int getOverflow();
     method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+    property public static final int MaxLines;
     property public final int Overflow;
     property public final androidx.compose.ui.text.style.TextAlign? TextAlign;
     field public static final androidx.wear.compose.material3.TextConfigurationDefaults INSTANCE;
@@ -1607,6 +1616,9 @@
     method @androidx.compose.runtime.Composable public androidx.compose.ui.text.TextStyle timeTextStyle(optional long background, optional long color, optional long fontSize);
     property public final float AutoTextWeight;
     property public final androidx.compose.foundation.layout.PaddingValues ContentPadding;
+    property public static final float MaxSweepAngle;
+    property public static final String TimeFormat12Hours;
+    property public static final String TimeFormat24Hours;
     field public static final androidx.wear.compose.material3.TimeTextDefaults INSTANCE;
     field public static final float MaxSweepAngle = 70.0f;
     field public static final String TimeFormat12Hours = "h:mm";
diff --git a/wear/protolayout/protolayout-material3/api/current.txt b/wear/protolayout/protolayout-material3/api/current.txt
index 1d7169c..0255599 100644
--- a/wear/protolayout/protolayout-material3/api/current.txt
+++ b/wear/protolayout/protolayout-material3/api/current.txt
@@ -2,6 +2,8 @@
 package androidx.wear.protolayout.material3 {
 
   public final class ButtonGroupDefaults {
+    property public final androidx.wear.protolayout.LayoutElementBuilders.Spacer DEFAULT_SPACER_BETWEEN_BUTTON_GROUPS;
+    property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public static final float DEFAULT_SPACER_WIDTH_DP;
     field public static final androidx.wear.protolayout.LayoutElementBuilders.Spacer DEFAULT_SPACER_BETWEEN_BUTTON_GROUPS;
     field @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public static final float DEFAULT_SPACER_WIDTH_DP = 4.0f;
     field public static final androidx.wear.protolayout.material3.ButtonGroupDefaults INSTANCE;
@@ -16,6 +18,34 @@
   }
 
   public final class ColorTokens {
+    property public static final int BACKGROUND;
+    property public static final int ERROR;
+    property public static final int ERROR_CONTAINER;
+    property public static final int ON_BACKGROUND;
+    property public static final int ON_ERROR;
+    property public static final int ON_ERROR_CONTAINER;
+    property public static final int ON_PRIMARY;
+    property public static final int ON_PRIMARY_CONTAINER;
+    property public static final int ON_SECONDARY;
+    property public static final int ON_SECONDARY_CONTAINER;
+    property public static final int ON_SURFACE;
+    property public static final int ON_SURFACE_VARIANT;
+    property public static final int ON_TERTIARY;
+    property public static final int ON_TERTIARY_CONTAINER;
+    property public static final int OUTLINE;
+    property public static final int OUTLINE_VARIANT;
+    property public static final int PRIMARY;
+    property public static final int PRIMARY_CONTAINER;
+    property public static final int PRIMARY_DIM;
+    property public static final int SECONDARY;
+    property public static final int SECONDARY_CONTAINER;
+    property public static final int SECONDARY_DIM;
+    property public static final int SURFACE_CONTAINER;
+    property public static final int SURFACE_CONTAINER_HIGH;
+    property public static final int SURFACE_CONTAINER_LOW;
+    property public static final int TERTIARY;
+    property public static final int TERTIARY_CONTAINER;
+    property public static final int TERTIARY_DIM;
     field public static final int BACKGROUND = 0; // 0x0
     field public static final int ERROR = 1; // 0x1
     field public static final int ERROR_CONTAINER = 2; // 0x2
@@ -74,6 +104,8 @@
   }
 
   public static final class EdgeButtonStyle.Companion {
+    property public final androidx.wear.protolayout.material3.EdgeButtonStyle DEFAULT;
+    property public final androidx.wear.protolayout.material3.EdgeButtonStyle TOP_ALIGN;
   }
 
   public final class IconKt {
@@ -100,6 +132,13 @@
   }
 
   public final class Shape {
+    property public static final int CORNER_EXTRA_LARGE;
+    property public static final int CORNER_EXTRA_SMALL;
+    property public static final int CORNER_FULL;
+    property public static final int CORNER_LARGE;
+    property public static final int CORNER_MEDIUM;
+    property public static final int CORNER_NONE;
+    property public static final int CORNER_SMALL;
     field public static final int CORNER_EXTRA_LARGE = 0; // 0x0
     field public static final int CORNER_EXTRA_SMALL = 1; // 0x1
     field public static final int CORNER_FULL = 2; // 0x2
@@ -115,6 +154,26 @@
   }
 
   public final class Typography {
+    property public static final int ARC_MEDIUM;
+    property public static final int ARC_SMALL;
+    property public static final int BODY_EXTRA_SMALL;
+    property public static final int BODY_LARGE;
+    property public static final int BODY_MEDIUM;
+    property public static final int BODY_SMALL;
+    property public static final int DISPLAY_LARGE;
+    property public static final int DISPLAY_MEDIUM;
+    property public static final int DISPLAY_SMALL;
+    property public static final int LABEL_LARGE;
+    property public static final int LABEL_MEDIUM;
+    property public static final int LABEL_SMALL;
+    property public static final int NUMERAL_EXTRA_LARGE;
+    property public static final int NUMERAL_EXTRA_SMALL;
+    property public static final int NUMERAL_LARGE;
+    property public static final int NUMERAL_MEDIUM;
+    property public static final int NUMERAL_SMALL;
+    property public static final int TITLE_LARGE;
+    property public static final int TITLE_MEDIUM;
+    property public static final int TITLE_SMALL;
     field public static final int ARC_MEDIUM = 0; // 0x0
     field public static final int ARC_SMALL = 1; // 0x1
     field public static final int BODY_EXTRA_SMALL = 2; // 0x2
diff --git a/wear/protolayout/protolayout-material3/api/restricted_current.txt b/wear/protolayout/protolayout-material3/api/restricted_current.txt
index 1d7169c..0255599 100644
--- a/wear/protolayout/protolayout-material3/api/restricted_current.txt
+++ b/wear/protolayout/protolayout-material3/api/restricted_current.txt
@@ -2,6 +2,8 @@
 package androidx.wear.protolayout.material3 {
 
   public final class ButtonGroupDefaults {
+    property public final androidx.wear.protolayout.LayoutElementBuilders.Spacer DEFAULT_SPACER_BETWEEN_BUTTON_GROUPS;
+    property @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public static final float DEFAULT_SPACER_WIDTH_DP;
     field public static final androidx.wear.protolayout.LayoutElementBuilders.Spacer DEFAULT_SPACER_BETWEEN_BUTTON_GROUPS;
     field @Dimension(unit=androidx.annotation.Dimension.Companion.DP) public static final float DEFAULT_SPACER_WIDTH_DP = 4.0f;
     field public static final androidx.wear.protolayout.material3.ButtonGroupDefaults INSTANCE;
@@ -16,6 +18,34 @@
   }
 
   public final class ColorTokens {
+    property public static final int BACKGROUND;
+    property public static final int ERROR;
+    property public static final int ERROR_CONTAINER;
+    property public static final int ON_BACKGROUND;
+    property public static final int ON_ERROR;
+    property public static final int ON_ERROR_CONTAINER;
+    property public static final int ON_PRIMARY;
+    property public static final int ON_PRIMARY_CONTAINER;
+    property public static final int ON_SECONDARY;
+    property public static final int ON_SECONDARY_CONTAINER;
+    property public static final int ON_SURFACE;
+    property public static final int ON_SURFACE_VARIANT;
+    property public static final int ON_TERTIARY;
+    property public static final int ON_TERTIARY_CONTAINER;
+    property public static final int OUTLINE;
+    property public static final int OUTLINE_VARIANT;
+    property public static final int PRIMARY;
+    property public static final int PRIMARY_CONTAINER;
+    property public static final int PRIMARY_DIM;
+    property public static final int SECONDARY;
+    property public static final int SECONDARY_CONTAINER;
+    property public static final int SECONDARY_DIM;
+    property public static final int SURFACE_CONTAINER;
+    property public static final int SURFACE_CONTAINER_HIGH;
+    property public static final int SURFACE_CONTAINER_LOW;
+    property public static final int TERTIARY;
+    property public static final int TERTIARY_CONTAINER;
+    property public static final int TERTIARY_DIM;
     field public static final int BACKGROUND = 0; // 0x0
     field public static final int ERROR = 1; // 0x1
     field public static final int ERROR_CONTAINER = 2; // 0x2
@@ -74,6 +104,8 @@
   }
 
   public static final class EdgeButtonStyle.Companion {
+    property public final androidx.wear.protolayout.material3.EdgeButtonStyle DEFAULT;
+    property public final androidx.wear.protolayout.material3.EdgeButtonStyle TOP_ALIGN;
   }
 
   public final class IconKt {
@@ -100,6 +132,13 @@
   }
 
   public final class Shape {
+    property public static final int CORNER_EXTRA_LARGE;
+    property public static final int CORNER_EXTRA_SMALL;
+    property public static final int CORNER_FULL;
+    property public static final int CORNER_LARGE;
+    property public static final int CORNER_MEDIUM;
+    property public static final int CORNER_NONE;
+    property public static final int CORNER_SMALL;
     field public static final int CORNER_EXTRA_LARGE = 0; // 0x0
     field public static final int CORNER_EXTRA_SMALL = 1; // 0x1
     field public static final int CORNER_FULL = 2; // 0x2
@@ -115,6 +154,26 @@
   }
 
   public final class Typography {
+    property public static final int ARC_MEDIUM;
+    property public static final int ARC_SMALL;
+    property public static final int BODY_EXTRA_SMALL;
+    property public static final int BODY_LARGE;
+    property public static final int BODY_MEDIUM;
+    property public static final int BODY_SMALL;
+    property public static final int DISPLAY_LARGE;
+    property public static final int DISPLAY_MEDIUM;
+    property public static final int DISPLAY_SMALL;
+    property public static final int LABEL_LARGE;
+    property public static final int LABEL_MEDIUM;
+    property public static final int LABEL_SMALL;
+    property public static final int NUMERAL_EXTRA_LARGE;
+    property public static final int NUMERAL_EXTRA_SMALL;
+    property public static final int NUMERAL_LARGE;
+    property public static final int NUMERAL_MEDIUM;
+    property public static final int NUMERAL_SMALL;
+    property public static final int TITLE_LARGE;
+    property public static final int TITLE_MEDIUM;
+    property public static final int TITLE_SMALL;
     field public static final int ARC_MEDIUM = 0; // 0x0
     field public static final int ARC_SMALL = 1; // 0x1
     field public static final int BODY_EXTRA_SMALL = 2; // 0x2
diff --git a/wear/tiles/tiles-tooling-preview/api/current.txt b/wear/tiles/tiles-tooling-preview/api/current.txt
index 92cb1ae..9577f64 100644
--- a/wear/tiles/tiles-tooling-preview/api/current.txt
+++ b/wear/tiles/tiles-tooling-preview/api/current.txt
@@ -16,6 +16,11 @@
 
   @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.wear.tiles.tooling.preview.Preview[] value();
+    property public abstract String device;
+    property @FloatRange(from=0.01) public abstract float fontScale;
+    property public abstract String group;
+    property public abstract String locale;
+    property public abstract String name;
   }
 
   public final class TilePreviewData {
diff --git a/wear/tiles/tiles-tooling-preview/api/restricted_current.txt b/wear/tiles/tiles-tooling-preview/api/restricted_current.txt
index 92cb1ae..9577f64 100644
--- a/wear/tiles/tiles-tooling-preview/api/restricted_current.txt
+++ b/wear/tiles/tiles-tooling-preview/api/restricted_current.txt
@@ -16,6 +16,11 @@
 
   @kotlin.annotation.MustBeDocumented @kotlin.annotation.Repeatable @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public static @interface Preview.Container {
     method public abstract androidx.wear.tiles.tooling.preview.Preview[] value();
+    property public abstract String device;
+    property @FloatRange(from=0.01) public abstract float fontScale;
+    property public abstract String group;
+    property public abstract String locale;
+    property public abstract String name;
   }
 
   public final class TilePreviewData {
diff --git a/wear/watchface/watchface-client/api/current.txt b/wear/watchface/watchface-client/api/current.txt
index f1626c9..04356d9 100644
--- a/wear/watchface/watchface-client/api/current.txt
+++ b/wear/watchface/watchface-client/api/current.txt
@@ -73,6 +73,8 @@
   }
 
   public final class DisconnectReasons {
+    property public static final int ENGINE_DETACHED;
+    property public static final int ENGINE_DIED;
     field public static final int ENGINE_DETACHED = 2; // 0x2
     field public static final int ENGINE_DIED = 1; // 0x1
     field public static final androidx.wear.watchface.client.DisconnectReasons INSTANCE;
@@ -176,6 +178,9 @@
   }
 
   public static final class InteractiveWatchFaceClient.Companion {
+    property public static final int TAP_TYPE_CANCEL;
+    property public static final int TAP_TYPE_DOWN;
+    property public static final int TAP_TYPE_UP;
     field public static final int TAP_TYPE_CANCEL = 1; // 0x1
     field public static final int TAP_TYPE_DOWN = 0; // 0x0
     field public static final int TAP_TYPE_UP = 2; // 0x2
diff --git a/wear/watchface/watchface-client/api/restricted_current.txt b/wear/watchface/watchface-client/api/restricted_current.txt
index f1626c9..04356d9 100644
--- a/wear/watchface/watchface-client/api/restricted_current.txt
+++ b/wear/watchface/watchface-client/api/restricted_current.txt
@@ -73,6 +73,8 @@
   }
 
   public final class DisconnectReasons {
+    property public static final int ENGINE_DETACHED;
+    property public static final int ENGINE_DIED;
     field public static final int ENGINE_DETACHED = 2; // 0x2
     field public static final int ENGINE_DIED = 1; // 0x1
     field public static final androidx.wear.watchface.client.DisconnectReasons INSTANCE;
@@ -176,6 +178,9 @@
   }
 
   public static final class InteractiveWatchFaceClient.Companion {
+    property public static final int TAP_TYPE_CANCEL;
+    property public static final int TAP_TYPE_DOWN;
+    property public static final int TAP_TYPE_UP;
     field public static final int TAP_TYPE_CANCEL = 1; // 0x1
     field public static final int TAP_TYPE_DOWN = 0; // 0x0
     field public static final int TAP_TYPE_UP = 2; // 0x2
diff --git a/wear/watchface/watchface-complications-data-source/api/current.txt b/wear/watchface/watchface-complications-data-source/api/current.txt
index 929095b..c2fe661 100644
--- a/wear/watchface/watchface-complications-data-source/api/current.txt
+++ b/wear/watchface/watchface-complications-data-source/api/current.txt
@@ -27,6 +27,19 @@
   }
 
   public static final class ComplicationDataSourceService.Companion {
+    property public static final String ACTION_COMPLICATION_UPDATE_REQUEST;
+    property public static final String CATEGORY_DATA_SOURCE_CONFIG;
+    property public static final String EXTRA_CONFIG_COMPLICATION_ID;
+    property public static final String EXTRA_CONFIG_COMPLICATION_TYPE;
+    property public static final String EXTRA_CONFIG_DATA_SOURCE_COMPONENT;
+    property @RequiresApi(android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final String METADATA_KEY_CONFIG_RESTORE_SUPPORTED;
+    property public static final String METADATA_KEY_DATA_SOURCE_CONFIG_ACTION;
+    property public static final String METADATA_KEY_DATA_SOURCE_DEFAULT_CONFIG_SUPPORTED;
+    property public static final String METADATA_KEY_IMMEDIATE_UPDATE_PERIOD_MILLISECONDS;
+    property public static final String METADATA_KEY_SAFE_WATCH_FACES;
+    property public static final String METADATA_KEY_SAFE_WATCH_FACE_SUPPORTED_TYPES;
+    property public static final String METADATA_KEY_SUPPORTED_TYPES;
+    property public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS;
   }
 
   @kotlin.jvm.JvmDefaultWithCompatibility public static interface ComplicationDataSourceService.ComplicationRequestListener {
@@ -68,6 +81,9 @@
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class TargetWatchFaceSafety {
+    property public static final int SAFE;
+    property public static final int UNKNOWN;
+    property public static final int UNSAFE;
     field public static final androidx.wear.watchface.complications.datasource.TargetWatchFaceSafety INSTANCE;
     field public static final int SAFE = 1; // 0x1
     field public static final int UNKNOWN = 0; // 0x0
diff --git a/wear/watchface/watchface-complications-data-source/api/restricted_current.txt b/wear/watchface/watchface-complications-data-source/api/restricted_current.txt
index 929095b..c2fe661 100644
--- a/wear/watchface/watchface-complications-data-source/api/restricted_current.txt
+++ b/wear/watchface/watchface-complications-data-source/api/restricted_current.txt
@@ -27,6 +27,19 @@
   }
 
   public static final class ComplicationDataSourceService.Companion {
+    property public static final String ACTION_COMPLICATION_UPDATE_REQUEST;
+    property public static final String CATEGORY_DATA_SOURCE_CONFIG;
+    property public static final String EXTRA_CONFIG_COMPLICATION_ID;
+    property public static final String EXTRA_CONFIG_COMPLICATION_TYPE;
+    property public static final String EXTRA_CONFIG_DATA_SOURCE_COMPONENT;
+    property @RequiresApi(android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final String METADATA_KEY_CONFIG_RESTORE_SUPPORTED;
+    property public static final String METADATA_KEY_DATA_SOURCE_CONFIG_ACTION;
+    property public static final String METADATA_KEY_DATA_SOURCE_DEFAULT_CONFIG_SUPPORTED;
+    property public static final String METADATA_KEY_IMMEDIATE_UPDATE_PERIOD_MILLISECONDS;
+    property public static final String METADATA_KEY_SAFE_WATCH_FACES;
+    property public static final String METADATA_KEY_SAFE_WATCH_FACE_SUPPORTED_TYPES;
+    property public static final String METADATA_KEY_SUPPORTED_TYPES;
+    property public static final String METADATA_KEY_UPDATE_PERIOD_SECONDS;
   }
 
   @kotlin.jvm.JvmDefaultWithCompatibility public static interface ComplicationDataSourceService.ComplicationRequestListener {
@@ -68,6 +81,9 @@
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class TargetWatchFaceSafety {
+    property public static final int SAFE;
+    property public static final int UNKNOWN;
+    property public static final int UNSAFE;
     field public static final androidx.wear.watchface.complications.datasource.TargetWatchFaceSafety INSTANCE;
     field public static final int SAFE = 1; // 0x1
     field public static final int UNKNOWN = 0; // 0x0
diff --git a/wear/watchface/watchface-complications-data/api/current.txt b/wear/watchface/watchface-complications-data/api/current.txt
index c08b1ea..2e3f118 100644
--- a/wear/watchface/watchface-complications-data/api/current.txt
+++ b/wear/watchface/watchface-complications-data/api/current.txt
@@ -32,6 +32,8 @@
   }
 
   public final class ComplicationDisplayPolicies {
+    property public static final int ALWAYS_DISPLAY;
+    property public static final int DO_NOT_SHOW_WHEN_DEVICE_LOCKED;
     field public static final int ALWAYS_DISPLAY = 0; // 0x0
     field public static final int DO_NOT_SHOW_WHEN_DEVICE_LOCKED = 1; // 0x1
     field public static final androidx.wear.watchface.complications.data.ComplicationDisplayPolicies INSTANCE;
@@ -41,6 +43,8 @@
   }
 
   public final class ComplicationPersistencePolicies {
+    property public static final int CACHING_ALLOWED;
+    property public static final int DO_NOT_PERSIST;
     field public static final int CACHING_ALLOWED = 0; // 0x0
     field public static final int DO_NOT_PERSIST = 1; // 0x1
     field public static final androidx.wear.watchface.complications.data.ComplicationPersistencePolicies INSTANCE;
@@ -57,6 +61,8 @@
   }
 
   public static final class ComplicationText.Companion {
+    property public androidx.wear.watchface.complications.data.ComplicationText EMPTY;
+    property public androidx.wear.watchface.complications.data.ComplicationText PLACEHOLDER;
   }
 
   public enum ComplicationType {
@@ -110,6 +116,7 @@
   }
 
   public static final class EmptyComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class GoalProgressComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -155,6 +162,8 @@
   }
 
   public static final class GoalProgressComplicationData.Companion {
+    property public final float PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class LongTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -187,6 +196,7 @@
   }
 
   public static final class LongTextComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class MonochromaticImage {
@@ -205,6 +215,7 @@
   }
 
   public static final class MonochromaticImage.Companion {
+    property public final androidx.wear.watchface.complications.data.MonochromaticImage PLACEHOLDER;
   }
 
   public final class MonochromaticImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -228,6 +239,7 @@
   }
 
   public static final class MonochromaticImageComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NoDataComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -244,6 +256,7 @@
   }
 
   public static final class NoDataComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NoPermissionComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -273,6 +286,7 @@
   }
 
   public static final class NoPermissionComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NotConfiguredComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -282,6 +296,7 @@
   }
 
   public static final class NotConfiguredComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class PhotoImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -306,6 +321,8 @@
   }
 
   public static final class PhotoImageComplicationData.Companion {
+    property public final android.graphics.drawable.Icon PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class PlainComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
@@ -371,6 +388,11 @@
   }
 
   public static final class RangedValueComplicationData.Companion {
+    property public final float PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+    property public static final int TYPE_PERCENTAGE;
+    property public static final int TYPE_RATING;
+    property public static final int TYPE_UNDEFINED;
   }
 
   public final class ShortTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -404,6 +426,8 @@
   }
 
   public static final class ShortTextComplicationData.Companion {
+    property public final int MAX_TEXT_LENGTH;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class SmallImage {
@@ -424,6 +448,7 @@
   }
 
   public static final class SmallImage.Companion {
+    property public final androidx.wear.watchface.complications.data.SmallImage PLACEHOLDER;
   }
 
   public final class SmallImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -447,6 +472,7 @@
   }
 
   public static final class SmallImageComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public enum SmallImageType {
@@ -517,6 +543,7 @@
     method public androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
     method public androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
     method public androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+    property public final androidx.wear.watchface.complications.data.TimeRange ALWAYS;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class WeightedElementsComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -558,6 +585,8 @@
 
   public static final class WeightedElementsComplicationData.Companion {
     method public int getMaxElements();
+    property public final java.util.List<? extends androidx.wear.watchface.complications.data.WeightedElementsComplicationData.Element> PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public static final class WeightedElementsComplicationData.Element {
diff --git a/wear/watchface/watchface-complications-data/api/restricted_current.txt b/wear/watchface/watchface-complications-data/api/restricted_current.txt
index c08b1ea..2e3f118 100644
--- a/wear/watchface/watchface-complications-data/api/restricted_current.txt
+++ b/wear/watchface/watchface-complications-data/api/restricted_current.txt
@@ -32,6 +32,8 @@
   }
 
   public final class ComplicationDisplayPolicies {
+    property public static final int ALWAYS_DISPLAY;
+    property public static final int DO_NOT_SHOW_WHEN_DEVICE_LOCKED;
     field public static final int ALWAYS_DISPLAY = 0; // 0x0
     field public static final int DO_NOT_SHOW_WHEN_DEVICE_LOCKED = 1; // 0x1
     field public static final androidx.wear.watchface.complications.data.ComplicationDisplayPolicies INSTANCE;
@@ -41,6 +43,8 @@
   }
 
   public final class ComplicationPersistencePolicies {
+    property public static final int CACHING_ALLOWED;
+    property public static final int DO_NOT_PERSIST;
     field public static final int CACHING_ALLOWED = 0; // 0x0
     field public static final int DO_NOT_PERSIST = 1; // 0x1
     field public static final androidx.wear.watchface.complications.data.ComplicationPersistencePolicies INSTANCE;
@@ -57,6 +61,8 @@
   }
 
   public static final class ComplicationText.Companion {
+    property public androidx.wear.watchface.complications.data.ComplicationText EMPTY;
+    property public androidx.wear.watchface.complications.data.ComplicationText PLACEHOLDER;
   }
 
   public enum ComplicationType {
@@ -110,6 +116,7 @@
   }
 
   public static final class EmptyComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class GoalProgressComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -155,6 +162,8 @@
   }
 
   public static final class GoalProgressComplicationData.Companion {
+    property public final float PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class LongTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -187,6 +196,7 @@
   }
 
   public static final class LongTextComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class MonochromaticImage {
@@ -205,6 +215,7 @@
   }
 
   public static final class MonochromaticImage.Companion {
+    property public final androidx.wear.watchface.complications.data.MonochromaticImage PLACEHOLDER;
   }
 
   public final class MonochromaticImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -228,6 +239,7 @@
   }
 
   public static final class MonochromaticImageComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NoDataComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -244,6 +256,7 @@
   }
 
   public static final class NoDataComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NoPermissionComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -273,6 +286,7 @@
   }
 
   public static final class NoPermissionComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class NotConfiguredComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -282,6 +296,7 @@
   }
 
   public static final class NotConfiguredComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class PhotoImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -306,6 +321,8 @@
   }
 
   public static final class PhotoImageComplicationData.Companion {
+    property public final android.graphics.drawable.Icon PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class PlainComplicationText implements androidx.wear.watchface.complications.data.ComplicationText {
@@ -371,6 +388,11 @@
   }
 
   public static final class RangedValueComplicationData.Companion {
+    property public final float PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
+    property public static final int TYPE_PERCENTAGE;
+    property public static final int TYPE_RATING;
+    property public static final int TYPE_UNDEFINED;
   }
 
   public final class ShortTextComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -404,6 +426,8 @@
   }
 
   public static final class ShortTextComplicationData.Companion {
+    property public final int MAX_TEXT_LENGTH;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public final class SmallImage {
@@ -424,6 +448,7 @@
   }
 
   public static final class SmallImage.Companion {
+    property public final androidx.wear.watchface.complications.data.SmallImage PLACEHOLDER;
   }
 
   public final class SmallImageComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -447,6 +472,7 @@
   }
 
   public static final class SmallImageComplicationData.Companion {
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public enum SmallImageType {
@@ -517,6 +543,7 @@
     method public androidx.wear.watchface.complications.data.TimeRange after(java.time.Instant startInstant);
     method public androidx.wear.watchface.complications.data.TimeRange before(java.time.Instant endInstant);
     method public androidx.wear.watchface.complications.data.TimeRange between(java.time.Instant startInstant, java.time.Instant endInstant);
+    property public final androidx.wear.watchface.complications.data.TimeRange ALWAYS;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public final class WeightedElementsComplicationData extends androidx.wear.watchface.complications.data.ComplicationData {
@@ -558,6 +585,8 @@
 
   public static final class WeightedElementsComplicationData.Companion {
     method public int getMaxElements();
+    property public final java.util.List<? extends androidx.wear.watchface.complications.data.WeightedElementsComplicationData.Element> PLACEHOLDER;
+    property public final androidx.wear.watchface.complications.data.ComplicationType TYPE;
   }
 
   public static final class WeightedElementsComplicationData.Element {
diff --git a/wear/watchface/watchface-complications-rendering/api/current.txt b/wear/watchface/watchface-complications-rendering/api/current.txt
index 97f9d47..0b4d842 100644
--- a/wear/watchface/watchface-complications-rendering/api/current.txt
+++ b/wear/watchface/watchface-complications-rendering/api/current.txt
@@ -139,6 +139,10 @@
   }
 
   public static final class ComplicationStyle.Companion {
+    property @Px public static final int BORDER_RADIUS_DEFAULT;
+    property public static final int BORDER_STYLE_DASHED;
+    property public static final int BORDER_STYLE_NONE;
+    property public static final int BORDER_STYLE_SOLID;
   }
 
   public final class GlesTextureComplication {
diff --git a/wear/watchface/watchface-complications-rendering/api/restricted_current.txt b/wear/watchface/watchface-complications-rendering/api/restricted_current.txt
index 97f9d47..0b4d842 100644
--- a/wear/watchface/watchface-complications-rendering/api/restricted_current.txt
+++ b/wear/watchface/watchface-complications-rendering/api/restricted_current.txt
@@ -139,6 +139,10 @@
   }
 
   public static final class ComplicationStyle.Companion {
+    property @Px public static final int BORDER_RADIUS_DEFAULT;
+    property public static final int BORDER_STYLE_DASHED;
+    property public static final int BORDER_STYLE_NONE;
+    property public static final int BORDER_STYLE_SOLID;
   }
 
   public final class GlesTextureComplication {
diff --git a/wear/watchface/watchface-complications/api/current.txt b/wear/watchface/watchface-complications/api/current.txt
index 46dbdf8..bb7bbe9 100644
--- a/wear/watchface/watchface-complications/api/current.txt
+++ b/wear/watchface/watchface-complications/api/current.txt
@@ -96,6 +96,20 @@
   }
 
   public static final class SystemDataSources.Companion {
+    property public static final int DATA_SOURCE_APP_SHORTCUT;
+    property public static final int DATA_SOURCE_DATE;
+    property public static final int DATA_SOURCE_DAY_AND_DATE;
+    property public static final int DATA_SOURCE_DAY_OF_WEEK;
+    property public static final int DATA_SOURCE_FAVORITE_CONTACT;
+    property @RequiresApi(android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final int DATA_SOURCE_HEART_RATE;
+    property public static final int DATA_SOURCE_NEXT_EVENT;
+    property public static final int DATA_SOURCE_STEP_COUNT;
+    property public static final int DATA_SOURCE_SUNRISE_SUNSET;
+    property public static final int DATA_SOURCE_TIME_AND_DATE;
+    property public static final int DATA_SOURCE_UNREAD_NOTIFICATION_COUNT;
+    property public static final int DATA_SOURCE_WATCH_BATTERY;
+    property public static final int DATA_SOURCE_WORLD_CLOCK;
+    property public static final int NO_DATA_SOURCE;
   }
 
 }
diff --git a/wear/watchface/watchface-complications/api/restricted_current.txt b/wear/watchface/watchface-complications/api/restricted_current.txt
index 46dbdf8..bb7bbe9 100644
--- a/wear/watchface/watchface-complications/api/restricted_current.txt
+++ b/wear/watchface/watchface-complications/api/restricted_current.txt
@@ -96,6 +96,20 @@
   }
 
   public static final class SystemDataSources.Companion {
+    property public static final int DATA_SOURCE_APP_SHORTCUT;
+    property public static final int DATA_SOURCE_DATE;
+    property public static final int DATA_SOURCE_DAY_AND_DATE;
+    property public static final int DATA_SOURCE_DAY_OF_WEEK;
+    property public static final int DATA_SOURCE_FAVORITE_CONTACT;
+    property @RequiresApi(android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public static final int DATA_SOURCE_HEART_RATE;
+    property public static final int DATA_SOURCE_NEXT_EVENT;
+    property public static final int DATA_SOURCE_STEP_COUNT;
+    property public static final int DATA_SOURCE_SUNRISE_SUNSET;
+    property public static final int DATA_SOURCE_TIME_AND_DATE;
+    property public static final int DATA_SOURCE_UNREAD_NOTIFICATION_COUNT;
+    property public static final int DATA_SOURCE_WATCH_BATTERY;
+    property public static final int DATA_SOURCE_WORLD_CLOCK;
+    property public static final int NO_DATA_SOURCE;
   }
 
 }
diff --git a/wear/watchface/watchface-editor/api/current.txt b/wear/watchface/watchface-editor/api/current.txt
index c3545b9..2d814e9 100644
--- a/wear/watchface/watchface-editor/api/current.txt
+++ b/wear/watchface/watchface-editor/api/current.txt
@@ -70,6 +70,8 @@
   public static final class EditorSession.Companion {
     method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
     method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+    property public java.time.Instant DEFAULT_PREVIEW_INSTANT;
+    property public java.time.Duration EDITING_SESSION_TIMEOUT;
   }
 
   public final class PreviewScreenshotParams {
@@ -89,6 +91,7 @@
   }
 
   public static final class WatchFaceEditorContract.Companion {
+    property public static final String ACTION_WATCH_FACE_EDITOR;
   }
 
 }
diff --git a/wear/watchface/watchface-editor/api/restricted_current.txt b/wear/watchface/watchface-editor/api/restricted_current.txt
index c3545b9..2d814e9 100644
--- a/wear/watchface/watchface-editor/api/restricted_current.txt
+++ b/wear/watchface/watchface-editor/api/restricted_current.txt
@@ -70,6 +70,8 @@
   public static final class EditorSession.Companion {
     method @RequiresApi(27) @UiThread public androidx.wear.watchface.editor.EditorSession createHeadlessEditorSession(androidx.activity.ComponentActivity activity, android.content.Intent editIntent, androidx.wear.watchface.client.HeadlessWatchFaceClient headlessWatchFaceClient);
     method @UiThread @kotlin.jvm.Throws(exceptionClasses=TimeoutCancellationException::class) public suspend Object? createOnWatchEditorSession(androidx.activity.ComponentActivity activity, kotlin.coroutines.Continuation<? super androidx.wear.watchface.editor.EditorSession>) throws kotlinx.coroutines.TimeoutCancellationException;
+    property public java.time.Instant DEFAULT_PREVIEW_INSTANT;
+    property public java.time.Duration EDITING_SESSION_TIMEOUT;
   }
 
   public final class PreviewScreenshotParams {
@@ -89,6 +91,7 @@
   }
 
   public static final class WatchFaceEditorContract.Companion {
+    property public static final String ACTION_WATCH_FACE_EDITOR;
   }
 
 }
diff --git a/wear/watchface/watchface-style/api/current.txt b/wear/watchface/watchface-style/api/current.txt
index 5d9f1c7..ff0acbd 100644
--- a/wear/watchface/watchface-style/api/current.txt
+++ b/wear/watchface/watchface-style/api/current.txt
@@ -126,6 +126,8 @@
 
   public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion {
     method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+    property public final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption FALSE;
+    property public final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption TRUE;
   }
 
   public static final class UserStyleSetting.BooleanUserStyleSetting.Builder {
@@ -249,6 +251,7 @@
   }
 
   public static final class UserStyleSetting.Id.Companion {
+    property public static final int MAX_LENGTH;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public static final class UserStyleSetting.LargeCustomValueUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
@@ -264,6 +267,7 @@
   }
 
   public static final class UserStyleSetting.LargeCustomValueUserStyleSetting.CustomValueOption.Companion {
+    property public static final int MAX_SIZE;
   }
 
   public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
@@ -354,6 +358,7 @@
   }
 
   public static final class UserStyleSetting.Option.Id.Companion {
+    property public static final int MAX_LENGTH;
   }
 
   public static final class UserStyleSetting.WatchFaceEditorData {
@@ -371,6 +376,7 @@
   }
 
   public static final class WatchFaceLayer.Companion {
+    property public final java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> ALL_WATCH_FACE_LAYERS;
   }
 
 }
diff --git a/wear/watchface/watchface-style/api/restricted_current.txt b/wear/watchface/watchface-style/api/restricted_current.txt
index 5d9f1c7..ff0acbd 100644
--- a/wear/watchface/watchface-style/api/restricted_current.txt
+++ b/wear/watchface/watchface-style/api/restricted_current.txt
@@ -126,6 +126,8 @@
 
   public static final class UserStyleSetting.BooleanUserStyleSetting.BooleanOption.Companion {
     method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption from(boolean value);
+    property public final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption FALSE;
+    property public final androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.BooleanOption TRUE;
   }
 
   public static final class UserStyleSetting.BooleanUserStyleSetting.Builder {
@@ -249,6 +251,7 @@
   }
 
   public static final class UserStyleSetting.Id.Companion {
+    property public static final int MAX_LENGTH;
   }
 
   @RequiresApi(android.os.Build.VERSION_CODES.TIRAMISU) public static final class UserStyleSetting.LargeCustomValueUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
@@ -264,6 +267,7 @@
   }
 
   public static final class UserStyleSetting.LargeCustomValueUserStyleSetting.CustomValueOption.Companion {
+    property public static final int MAX_SIZE;
   }
 
   public static class UserStyleSetting.ListUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
@@ -354,6 +358,7 @@
   }
 
   public static final class UserStyleSetting.Option.Id.Companion {
+    property public static final int MAX_LENGTH;
   }
 
   public static final class UserStyleSetting.WatchFaceEditorData {
@@ -371,6 +376,7 @@
   }
 
   public static final class WatchFaceLayer.Companion {
+    property public final java.util.Set<? extends androidx.wear.watchface.style.WatchFaceLayer> ALL_WATCH_FACE_LAYERS;
   }
 
 }
diff --git a/wear/watchface/watchface/api/current.txt b/wear/watchface/watchface/api/current.txt
index e2a0ec8..4cf3ec6 100644
--- a/wear/watchface/watchface/api/current.txt
+++ b/wear/watchface/watchface/api/current.txt
@@ -34,6 +34,8 @@
   }
 
   public final class CanvasType {
+    property public static final int HARDWARE;
+    property public static final int SOFTWARE;
     field public static final int HARDWARE = 1; // 0x1
     field public static final androidx.wear.watchface.CanvasType INSTANCE;
     field public static final int SOFTWARE = 0; // 0x0
@@ -108,6 +110,9 @@
   }
 
   public final class ComplicationSlotBoundsType {
+    property public static final int BACKGROUND;
+    property public static final int EDGE;
+    property public static final int ROUND_RECT;
     field public static final int BACKGROUND = 1; // 0x1
     field public static final int EDGE = 2; // 0x2
     field public static final androidx.wear.watchface.ComplicationSlotBoundsType INSTANCE;
@@ -179,6 +184,7 @@
   }
 
   public static final class RenderParameters.Companion {
+    property public final androidx.wear.watchface.RenderParameters DEFAULT_INTERACTIVE;
   }
 
   public static final class RenderParameters.HighlightLayer {
@@ -351,6 +357,9 @@
   }
 
   public final class TapType {
+    property public static final int CANCEL;
+    property public static final int DOWN;
+    property public static final int UP;
     field public static final int CANCEL = 1; // 0x1
     field public static final int DOWN = 0; // 0x0
     field public static final androidx.wear.watchface.TapType INSTANCE;
@@ -451,9 +460,12 @@
   }
 
   public static final class WatchFaceService.Companion {
+    property public static final int MAX_CREATE_WATCHFACE_TIME_MILLIS;
   }
 
   public final class WatchFaceType {
+    property public static final int ANALOG;
+    property public static final int DIGITAL;
     field public static final int ANALOG = 0; // 0x0
     field public static final int DIGITAL = 1; // 0x1
     field public static final androidx.wear.watchface.WatchFaceType INSTANCE;
diff --git a/wear/watchface/watchface/api/restricted_current.txt b/wear/watchface/watchface/api/restricted_current.txt
index e2a0ec8..4cf3ec6 100644
--- a/wear/watchface/watchface/api/restricted_current.txt
+++ b/wear/watchface/watchface/api/restricted_current.txt
@@ -34,6 +34,8 @@
   }
 
   public final class CanvasType {
+    property public static final int HARDWARE;
+    property public static final int SOFTWARE;
     field public static final int HARDWARE = 1; // 0x1
     field public static final androidx.wear.watchface.CanvasType INSTANCE;
     field public static final int SOFTWARE = 0; // 0x0
@@ -108,6 +110,9 @@
   }
 
   public final class ComplicationSlotBoundsType {
+    property public static final int BACKGROUND;
+    property public static final int EDGE;
+    property public static final int ROUND_RECT;
     field public static final int BACKGROUND = 1; // 0x1
     field public static final int EDGE = 2; // 0x2
     field public static final androidx.wear.watchface.ComplicationSlotBoundsType INSTANCE;
@@ -179,6 +184,7 @@
   }
 
   public static final class RenderParameters.Companion {
+    property public final androidx.wear.watchface.RenderParameters DEFAULT_INTERACTIVE;
   }
 
   public static final class RenderParameters.HighlightLayer {
@@ -351,6 +357,9 @@
   }
 
   public final class TapType {
+    property public static final int CANCEL;
+    property public static final int DOWN;
+    property public static final int UP;
     field public static final int CANCEL = 1; // 0x1
     field public static final int DOWN = 0; // 0x0
     field public static final androidx.wear.watchface.TapType INSTANCE;
@@ -451,9 +460,12 @@
   }
 
   public static final class WatchFaceService.Companion {
+    property public static final int MAX_CREATE_WATCHFACE_TIME_MILLIS;
   }
 
   public final class WatchFaceType {
+    property public static final int ANALOG;
+    property public static final int DIGITAL;
     field public static final int ANALOG = 0; // 0x0
     field public static final int DIGITAL = 1; // 0x1
     field public static final androidx.wear.watchface.WatchFaceType INSTANCE;
diff --git a/wear/wear-phone-interactions/api/current.txt b/wear/wear-phone-interactions/api/current.txt
index 6013a71..4659ee8 100644
--- a/wear/wear-phone-interactions/api/current.txt
+++ b/wear/wear-phone-interactions/api/current.txt
@@ -12,6 +12,10 @@
 
   public static final class PhoneTypeHelper.Companion {
     method public int getPhoneDeviceType(android.content.Context context);
+    property public static final int DEVICE_TYPE_ANDROID;
+    property public static final int DEVICE_TYPE_ERROR;
+    property public static final int DEVICE_TYPE_IOS;
+    property public static final int DEVICE_TYPE_UNKNOWN;
   }
 
 }
@@ -54,6 +58,8 @@
   }
 
   public static final class OAuthRequest.Companion {
+    property public static final String WEAR_REDIRECT_URL_PREFIX;
+    property public static final String WEAR_REDIRECT_URL_PREFIX_CN;
   }
 
   public final class OAuthResponse {
@@ -95,6 +101,13 @@
 
   public static final class RemoteAuthClient.Companion {
     method public androidx.wear.phone.interactions.authentication.RemoteAuthClient create(android.content.Context context);
+    property public static final int ERROR_PHONE_UNAVAILABLE;
+    property public static final int ERROR_UNSUPPORTED;
+    property public static final int NO_ERROR;
+    property public static final int STATUS_AVAILABLE;
+    property public static final int STATUS_TEMPORARILY_UNAVAILABLE;
+    property public static final int STATUS_UNAVAILABLE;
+    property public static final int STATUS_UNKNOWN;
   }
 
   public interface RemoteAuthRequestHandler {
diff --git a/wear/wear-phone-interactions/api/restricted_current.txt b/wear/wear-phone-interactions/api/restricted_current.txt
index 506b2c9..8b63c78 100644
--- a/wear/wear-phone-interactions/api/restricted_current.txt
+++ b/wear/wear-phone-interactions/api/restricted_current.txt
@@ -12,6 +12,10 @@
 
   public static final class PhoneTypeHelper.Companion {
     method public int getPhoneDeviceType(android.content.Context context);
+    property public static final int DEVICE_TYPE_ANDROID;
+    property public static final int DEVICE_TYPE_ERROR;
+    property public static final int DEVICE_TYPE_IOS;
+    property public static final int DEVICE_TYPE_UNKNOWN;
   }
 
 }
@@ -54,6 +58,8 @@
   }
 
   public static final class OAuthRequest.Companion {
+    property public static final String WEAR_REDIRECT_URL_PREFIX;
+    property public static final String WEAR_REDIRECT_URL_PREFIX_CN;
   }
 
   public final class OAuthResponse {
@@ -95,6 +101,13 @@
 
   public static final class RemoteAuthClient.Companion {
     method public androidx.wear.phone.interactions.authentication.RemoteAuthClient create(android.content.Context context);
+    property public static final int ERROR_PHONE_UNAVAILABLE;
+    property public static final int ERROR_UNSUPPORTED;
+    property public static final int NO_ERROR;
+    property public static final int STATUS_AVAILABLE;
+    property public static final int STATUS_TEMPORARILY_UNAVAILABLE;
+    property public static final int STATUS_UNAVAILABLE;
+    property public static final int STATUS_UNKNOWN;
   }
 
   @IntDef({androidx.wear.phone.interactions.authentication.RemoteAuthClient.NO_ERROR, androidx.wear.phone.interactions.authentication.RemoteAuthClient.ERROR_UNSUPPORTED, androidx.wear.phone.interactions.authentication.RemoteAuthClient.ERROR_PHONE_UNAVAILABLE}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE) public static @interface RemoteAuthClient.Companion.ErrorCode {
diff --git a/wear/wear-remote-interactions/api/current.txt b/wear/wear-remote-interactions/api/current.txt
index 754f9e9..217aba1 100644
--- a/wear/wear-remote-interactions/api/current.txt
+++ b/wear/wear-remote-interactions/api/current.txt
@@ -23,6 +23,13 @@
   public static final class RemoteActivityHelper.Companion {
     method public android.content.Intent? getTargetIntent(android.content.Intent intent);
     method public String? getTargetNodeId(android.content.Intent intent);
+    property public static final String ACTION_REMOTE_INTENT;
+    property public static final int RESULT_FAILED;
+    property public static final int RESULT_OK;
+    property public static final int STATUS_AVAILABLE;
+    property public static final int STATUS_TEMPORARILY_UNAVAILABLE;
+    property public static final int STATUS_UNAVAILABLE;
+    property public static final int STATUS_UNKNOWN;
   }
 
   public static final class RemoteActivityHelper.RemoteIntentException extends java.lang.Exception {
diff --git a/wear/wear-remote-interactions/api/restricted_current.txt b/wear/wear-remote-interactions/api/restricted_current.txt
index 754f9e9..217aba1 100644
--- a/wear/wear-remote-interactions/api/restricted_current.txt
+++ b/wear/wear-remote-interactions/api/restricted_current.txt
@@ -23,6 +23,13 @@
   public static final class RemoteActivityHelper.Companion {
     method public android.content.Intent? getTargetIntent(android.content.Intent intent);
     method public String? getTargetNodeId(android.content.Intent intent);
+    property public static final String ACTION_REMOTE_INTENT;
+    property public static final int RESULT_FAILED;
+    property public static final int RESULT_OK;
+    property public static final int STATUS_AVAILABLE;
+    property public static final int STATUS_TEMPORARILY_UNAVAILABLE;
+    property public static final int STATUS_UNAVAILABLE;
+    property public static final int STATUS_UNKNOWN;
   }
 
   public static final class RemoteActivityHelper.RemoteIntentException extends java.lang.Exception {
diff --git a/wear/wear-tooling-preview/api/current.txt b/wear/wear-tooling-preview/api/current.txt
index 49964db..8d88d44 100644
--- a/wear/wear-tooling-preview/api/current.txt
+++ b/wear/wear-tooling-preview/api/current.txt
@@ -2,6 +2,10 @@
 package androidx.wear.tooling.preview.devices {
 
   public final class WearDevices {
+    property public static final String LARGE_ROUND;
+    property public static final String RECT;
+    property public static final String SMALL_ROUND;
+    property public static final String SQUARE;
     field public static final androidx.wear.tooling.preview.devices.WearDevices INSTANCE;
     field public static final String LARGE_ROUND = "id:wearos_large_round";
     field public static final String RECT = "id:wearos_rect";
diff --git a/wear/wear-tooling-preview/api/restricted_current.txt b/wear/wear-tooling-preview/api/restricted_current.txt
index 49964db..8d88d44 100644
--- a/wear/wear-tooling-preview/api/restricted_current.txt
+++ b/wear/wear-tooling-preview/api/restricted_current.txt
@@ -2,6 +2,10 @@
 package androidx.wear.tooling.preview.devices {
 
   public final class WearDevices {
+    property public static final String LARGE_ROUND;
+    property public static final String RECT;
+    property public static final String SMALL_ROUND;
+    property public static final String SQUARE;
     field public static final androidx.wear.tooling.preview.devices.WearDevices INSTANCE;
     field public static final String LARGE_ROUND = "id:wearos_large_round";
     field public static final String RECT = "id:wearos_rect";
diff --git a/window/window-core/api/current.txt b/window/window-core/api/current.txt
index fbddd37..37e16a1 100644
--- a/window/window-core/api/current.txt
+++ b/window/window-core/api/current.txt
@@ -49,6 +49,11 @@
 
   public static final class WindowSizeClass.Companion {
     method @Deprecated public androidx.window.core.layout.WindowSizeClass compute(float dpWidth, float dpHeight);
+    property public final java.util.Set<? extends androidx.window.core.layout.WindowSizeClass> BREAKPOINTS_V1;
+    property public static final int HEIGHT_DP_EXPANDED_LOWER_BOUND;
+    property public static final int HEIGHT_DP_MEDIUM_LOWER_BOUND;
+    property public static final int WIDTH_DP_EXPANDED_LOWER_BOUND;
+    property public static final int WIDTH_DP_MEDIUM_LOWER_BOUND;
   }
 
   public final class WindowSizeClassSelectors {
diff --git a/window/window-core/api/restricted_current.txt b/window/window-core/api/restricted_current.txt
index fbddd37..37e16a1 100644
--- a/window/window-core/api/restricted_current.txt
+++ b/window/window-core/api/restricted_current.txt
@@ -49,6 +49,11 @@
 
   public static final class WindowSizeClass.Companion {
     method @Deprecated public androidx.window.core.layout.WindowSizeClass compute(float dpWidth, float dpHeight);
+    property public final java.util.Set<? extends androidx.window.core.layout.WindowSizeClass> BREAKPOINTS_V1;
+    property public static final int HEIGHT_DP_EXPANDED_LOWER_BOUND;
+    property public static final int HEIGHT_DP_MEDIUM_LOWER_BOUND;
+    property public static final int WIDTH_DP_EXPANDED_LOWER_BOUND;
+    property public static final int WIDTH_DP_MEDIUM_LOWER_BOUND;
   }
 
   public final class WindowSizeClassSelectors {
diff --git a/window/window-testing/api/current.txt b/window/window-testing/api/current.txt
index 44a3df7..8cad91b 100644
--- a/window/window-testing/api/current.txt
+++ b/window/window-testing/api/current.txt
@@ -59,6 +59,7 @@
   }
 
   public final class FoldingFeatureTestingConstants {
+    property public static final int FOLDING_FEATURE_CENTER_DEFAULT;
     field public static final int FOLDING_FEATURE_CENTER_DEFAULT = -1; // 0xffffffff
     field public static final androidx.window.testing.layout.FoldingFeatureTestingConstants INSTANCE;
   }
diff --git a/window/window-testing/api/restricted_current.txt b/window/window-testing/api/restricted_current.txt
index 44a3df7..8cad91b 100644
--- a/window/window-testing/api/restricted_current.txt
+++ b/window/window-testing/api/restricted_current.txt
@@ -59,6 +59,7 @@
   }
 
   public final class FoldingFeatureTestingConstants {
+    property public static final int FOLDING_FEATURE_CENTER_DEFAULT;
     field public static final int FOLDING_FEATURE_CENTER_DEFAULT = -1; // 0xffffffff
     field public static final androidx.window.testing.layout.FoldingFeatureTestingConstants INSTANCE;
   }
diff --git a/window/window/api/current.txt b/window/window/api/current.txt
index 6f3b574..05791bf 100644
--- a/window/window/api/current.txt
+++ b/window/window/api/current.txt
@@ -7,6 +7,13 @@
   }
 
   public final class WindowProperties {
+    property public static final String PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE;
+    property public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED;
+    property public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;
+    property public static final String PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE;
+    property public static final String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES;
+    property public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_FULLSCREEN_OVERRIDE;
+    property public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE;
     field public static final androidx.window.WindowProperties INSTANCE;
     field public static final String PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE = "android.window.PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE";
     field public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED = "android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED";
@@ -46,6 +53,8 @@
   }
 
   public static final class WindowAreaCapability.Operation.Companion {
+    property public final androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
+    property public final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status {
@@ -57,6 +66,10 @@
   }
 
   public static final class WindowAreaCapability.Status.Companion {
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNAVAILABLE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract class WindowAreaController {
@@ -90,6 +103,7 @@
   }
 
   public static final class WindowAreaInfo.Type.Companion {
+    property public final androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaPresentationSessionCallback {
@@ -186,6 +200,8 @@
   }
 
   public static final class DividerAttributes.Companion {
+    property public final androidx.window.embedding.DividerAttributes NO_DIVIDER;
+    property public static final int WIDTH_SYSTEM_DEFAULT;
   }
 
   public abstract static class DividerAttributes.DragRange {
@@ -194,6 +210,7 @@
   }
 
   public static final class DividerAttributes.DragRange.Companion {
+    property public final androidx.window.embedding.DividerAttributes.DragRange DRAG_RANGE_SYSTEM_DEFAULT;
   }
 
   public static final class DividerAttributes.DragRange.SplitRatioDragRange extends androidx.window.embedding.DividerAttributes.DragRange {
@@ -251,6 +268,7 @@
 
   public static final class EmbeddingAnimationBackground.Companion {
     method public androidx.window.embedding.EmbeddingAnimationBackground.ColorBackground createColorBackground(@ColorInt @IntRange(from=android.graphics.Color.BLACK.toLong(), to=android.graphics.Color.WHITE.toLong()) int color);
+    property public final androidx.window.embedding.EmbeddingAnimationBackground DEFAULT;
   }
 
   public final class EmbeddingAspectRatio {
@@ -262,6 +280,8 @@
 
   public static final class EmbeddingAspectRatio.Companion {
     method public androidx.window.embedding.EmbeddingAspectRatio ratio(@FloatRange(from=1.0, fromInclusive=false) float ratio);
+    property public final androidx.window.embedding.EmbeddingAspectRatio ALWAYS_ALLOW;
+    property public final androidx.window.embedding.EmbeddingAspectRatio ALWAYS_DISALLOW;
   }
 
   public final class EmbeddingConfiguration {
@@ -285,6 +305,9 @@
   }
 
   public static final class EmbeddingConfiguration.DimAreaBehavior.Companion {
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior ON_ACTIVITY_STACK;
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior ON_TASK;
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior UNDEFINED;
   }
 
   public abstract class EmbeddingRule {
@@ -347,6 +370,11 @@
   }
 
   public static final class SplitAttributes.LayoutDirection.Companion {
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection BOTTOM_TO_TOP;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection LEFT_TO_RIGHT;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection LOCALE;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection RIGHT_TO_LEFT;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection TOP_TO_BOTTOM;
   }
 
   public static final class SplitAttributes.SplitType {
@@ -359,6 +387,9 @@
 
   public static final class SplitAttributes.SplitType.Companion {
     method public androidx.window.embedding.SplitAttributes.SplitType ratio(@FloatRange(from=0.0, to=1.0, fromInclusive=false, toInclusive=false) float ratio);
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_EQUAL;
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_EXPAND;
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_HINGE;
   }
 
   public final class SplitAttributesCalculatorParams {
@@ -401,6 +432,9 @@
   }
 
   public static final class SplitController.SplitSupportStatus.Companion {
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_AVAILABLE;
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_ERROR_PROPERTY_NOT_DECLARED;
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_UNAVAILABLE;
   }
 
   public final class SplitInfo {
@@ -515,6 +549,10 @@
   }
 
   public static final class SplitRule.Companion {
+    property public final androidx.window.embedding.EmbeddingAspectRatio SPLIT_MAX_ASPECT_RATIO_LANDSCAPE_DEFAULT;
+    property public final androidx.window.embedding.EmbeddingAspectRatio SPLIT_MAX_ASPECT_RATIO_PORTRAIT_DEFAULT;
+    property public static final int SPLIT_MIN_DIMENSION_ALWAYS_ALLOW;
+    property public static final int SPLIT_MIN_DIMENSION_DP_DEFAULT;
   }
 
   public static final class SplitRule.FinishBehavior {
@@ -525,6 +563,9 @@
   }
 
   public static final class SplitRule.FinishBehavior.Companion {
+    property public final androidx.window.embedding.SplitRule.FinishBehavior ADJACENT;
+    property public final androidx.window.embedding.SplitRule.FinishBehavior ALWAYS;
+    property public final androidx.window.embedding.SplitRule.FinishBehavior NEVER;
   }
 
 }
@@ -554,6 +595,8 @@
   }
 
   public static final class FoldingFeature.OcclusionType.Companion {
+    property public final androidx.window.layout.FoldingFeature.OcclusionType FULL;
+    property public final androidx.window.layout.FoldingFeature.OcclusionType NONE;
   }
 
   public static final class FoldingFeature.Orientation {
@@ -563,6 +606,8 @@
   }
 
   public static final class FoldingFeature.Orientation.Companion {
+    property public final androidx.window.layout.FoldingFeature.Orientation HORIZONTAL;
+    property public final androidx.window.layout.FoldingFeature.Orientation VERTICAL;
   }
 
   public static final class FoldingFeature.State {
@@ -572,6 +617,8 @@
   }
 
   public static final class FoldingFeature.State.Companion {
+    property public final androidx.window.layout.FoldingFeature.State FLAT;
+    property public final androidx.window.layout.FoldingFeature.State HALF_OPENED;
   }
 
   public final class SupportedPosture {
@@ -580,6 +627,7 @@
   }
 
   public static final class SupportedPosture.Companion {
+    property public final androidx.window.layout.SupportedPosture TABLETOP;
   }
 
   public interface WindowInfoTracker {
diff --git a/window/window/api/restricted_current.txt b/window/window/api/restricted_current.txt
index c8ee10e..93851cf 100644
--- a/window/window/api/restricted_current.txt
+++ b/window/window/api/restricted_current.txt
@@ -7,6 +7,13 @@
   }
 
   public final class WindowProperties {
+    property public static final String PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE;
+    property public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED;
+    property public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED;
+    property public static final String PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE;
+    property public static final String PROPERTY_COMPAT_ALLOW_RESIZEABLE_ACTIVITY_OVERRIDES;
+    property public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_FULLSCREEN_OVERRIDE;
+    property public static final String PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE;
     field public static final androidx.window.WindowProperties INSTANCE;
     field public static final String PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE = "android.window.PROPERTY_ACTIVITY_EMBEDDING_ALLOW_SYSTEM_OVERRIDE";
     field public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED = "android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED";
@@ -46,6 +53,8 @@
   }
 
   public static final class WindowAreaCapability.Operation.Companion {
+    property public final androidx.window.area.WindowAreaCapability.Operation OPERATION_PRESENT_ON_AREA;
+    property public final androidx.window.area.WindowAreaCapability.Operation OPERATION_TRANSFER_ACTIVITY_TO_AREA;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public static final class WindowAreaCapability.Status {
@@ -57,6 +66,10 @@
   }
 
   public static final class WindowAreaCapability.Status.Companion {
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_ACTIVE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_AVAILABLE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNAVAILABLE;
+    property public final androidx.window.area.WindowAreaCapability.Status WINDOW_AREA_STATUS_UNSUPPORTED;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public abstract class WindowAreaController {
@@ -90,6 +103,7 @@
   }
 
   public static final class WindowAreaInfo.Type.Companion {
+    property public final androidx.window.area.WindowAreaInfo.Type TYPE_REAR_FACING;
   }
 
   @SuppressCompatibility @androidx.window.core.ExperimentalWindowApi public interface WindowAreaPresentationSessionCallback {
@@ -187,6 +201,8 @@
   }
 
   public static final class DividerAttributes.Companion {
+    property public final androidx.window.embedding.DividerAttributes NO_DIVIDER;
+    property public static final int WIDTH_SYSTEM_DEFAULT;
   }
 
   public abstract static class DividerAttributes.DragRange {
@@ -195,6 +211,7 @@
   }
 
   public static final class DividerAttributes.DragRange.Companion {
+    property public final androidx.window.embedding.DividerAttributes.DragRange DRAG_RANGE_SYSTEM_DEFAULT;
   }
 
   public static final class DividerAttributes.DragRange.SplitRatioDragRange extends androidx.window.embedding.DividerAttributes.DragRange {
@@ -252,6 +269,7 @@
 
   public static final class EmbeddingAnimationBackground.Companion {
     method public androidx.window.embedding.EmbeddingAnimationBackground.ColorBackground createColorBackground(@ColorInt @IntRange(from=android.graphics.Color.BLACK.toLong(), to=android.graphics.Color.WHITE.toLong()) int color);
+    property public final androidx.window.embedding.EmbeddingAnimationBackground DEFAULT;
   }
 
   public final class EmbeddingAspectRatio {
@@ -263,6 +281,8 @@
 
   public static final class EmbeddingAspectRatio.Companion {
     method public androidx.window.embedding.EmbeddingAspectRatio ratio(@FloatRange(from=1.0, fromInclusive=false) float ratio);
+    property public final androidx.window.embedding.EmbeddingAspectRatio ALWAYS_ALLOW;
+    property public final androidx.window.embedding.EmbeddingAspectRatio ALWAYS_DISALLOW;
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class EmbeddingBounds {
@@ -290,9 +310,18 @@
   }
 
   public static final class EmbeddingBounds.Alignment.Companion {
+    property public final androidx.window.embedding.EmbeddingBounds.Alignment ALIGN_BOTTOM;
+    property public final androidx.window.embedding.EmbeddingBounds.Alignment ALIGN_LEFT;
+    property public final androidx.window.embedding.EmbeddingBounds.Alignment ALIGN_RIGHT;
+    property public final androidx.window.embedding.EmbeddingBounds.Alignment ALIGN_TOP;
   }
 
   public static final class EmbeddingBounds.Companion {
+    property public final androidx.window.embedding.EmbeddingBounds BOUNDS_EXPANDED;
+    property public final androidx.window.embedding.EmbeddingBounds BOUNDS_HINGE_BOTTOM;
+    property public final androidx.window.embedding.EmbeddingBounds BOUNDS_HINGE_LEFT;
+    property public final androidx.window.embedding.EmbeddingBounds BOUNDS_HINGE_RIGHT;
+    property public final androidx.window.embedding.EmbeddingBounds BOUNDS_HINGE_TOP;
   }
 
   public abstract static class EmbeddingBounds.Dimension {
@@ -306,6 +335,8 @@
   public static final class EmbeddingBounds.Dimension.Companion {
     method public androidx.window.embedding.EmbeddingBounds.Dimension pixel(@IntRange(from=1L) @Px int value);
     method public androidx.window.embedding.EmbeddingBounds.Dimension ratio(@FloatRange(from=0.0, fromInclusive=false, to=1.0, toInclusive=false) float ratio);
+    property public final androidx.window.embedding.EmbeddingBounds.Dimension DIMENSION_EXPANDED;
+    property public final androidx.window.embedding.EmbeddingBounds.Dimension DIMENSION_HINGE;
   }
 
   public final class EmbeddingConfiguration {
@@ -329,6 +360,9 @@
   }
 
   public static final class EmbeddingConfiguration.DimAreaBehavior.Companion {
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior ON_ACTIVITY_STACK;
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior ON_TASK;
+    property public final androidx.window.embedding.EmbeddingConfiguration.DimAreaBehavior UNDEFINED;
   }
 
   public abstract class EmbeddingRule {
@@ -463,6 +497,11 @@
   }
 
   public static final class SplitAttributes.LayoutDirection.Companion {
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection BOTTOM_TO_TOP;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection LEFT_TO_RIGHT;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection LOCALE;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection RIGHT_TO_LEFT;
+    property public final androidx.window.embedding.SplitAttributes.LayoutDirection TOP_TO_BOTTOM;
   }
 
   public static final class SplitAttributes.SplitType {
@@ -475,6 +514,9 @@
 
   public static final class SplitAttributes.SplitType.Companion {
     method public androidx.window.embedding.SplitAttributes.SplitType ratio(@FloatRange(from=0.0, to=1.0, fromInclusive=false, toInclusive=false) float ratio);
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_EQUAL;
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_EXPAND;
+    property public final androidx.window.embedding.SplitAttributes.SplitType SPLIT_TYPE_HINGE;
   }
 
   public final class SplitAttributesCalculatorParams {
@@ -517,6 +559,9 @@
   }
 
   public static final class SplitController.SplitSupportStatus.Companion {
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_AVAILABLE;
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_ERROR_PROPERTY_NOT_DECLARED;
+    property public final androidx.window.embedding.SplitController.SplitSupportStatus SPLIT_UNAVAILABLE;
   }
 
   public final class SplitInfo {
@@ -631,6 +676,10 @@
   }
 
   public static final class SplitRule.Companion {
+    property public final androidx.window.embedding.EmbeddingAspectRatio SPLIT_MAX_ASPECT_RATIO_LANDSCAPE_DEFAULT;
+    property public final androidx.window.embedding.EmbeddingAspectRatio SPLIT_MAX_ASPECT_RATIO_PORTRAIT_DEFAULT;
+    property public static final int SPLIT_MIN_DIMENSION_ALWAYS_ALLOW;
+    property public static final int SPLIT_MIN_DIMENSION_DP_DEFAULT;
   }
 
   public static final class SplitRule.FinishBehavior {
@@ -641,6 +690,9 @@
   }
 
   public static final class SplitRule.FinishBehavior.Companion {
+    property public final androidx.window.embedding.SplitRule.FinishBehavior ADJACENT;
+    property public final androidx.window.embedding.SplitRule.FinishBehavior ALWAYS;
+    property public final androidx.window.embedding.SplitRule.FinishBehavior NEVER;
   }
 
 }
@@ -670,6 +722,8 @@
   }
 
   public static final class FoldingFeature.OcclusionType.Companion {
+    property public final androidx.window.layout.FoldingFeature.OcclusionType FULL;
+    property public final androidx.window.layout.FoldingFeature.OcclusionType NONE;
   }
 
   public static final class FoldingFeature.Orientation {
@@ -679,6 +733,8 @@
   }
 
   public static final class FoldingFeature.Orientation.Companion {
+    property public final androidx.window.layout.FoldingFeature.Orientation HORIZONTAL;
+    property public final androidx.window.layout.FoldingFeature.Orientation VERTICAL;
   }
 
   public static final class FoldingFeature.State {
@@ -688,6 +744,8 @@
   }
 
   public static final class FoldingFeature.State.Companion {
+    property public final androidx.window.layout.FoldingFeature.State FLAT;
+    property public final androidx.window.layout.FoldingFeature.State HALF_OPENED;
   }
 
   public final class SupportedPosture {
@@ -696,6 +754,7 @@
   }
 
   public static final class SupportedPosture.Companion {
+    property public final androidx.window.layout.SupportedPosture TABLETOP;
   }
 
   public interface WindowInfoTracker {
diff --git a/work/work-runtime/api/current.txt b/work/work-runtime/api/current.txt
index 97c561f..ec68d02 100644
--- a/work/work-runtime/api/current.txt
+++ b/work/work-runtime/api/current.txt
@@ -75,6 +75,7 @@
   }
 
   public static final class Configuration.Companion {
+    property public static final int MIN_SCHEDULER_LIMIT;
   }
 
   public static interface Configuration.Provider {
@@ -122,6 +123,7 @@
   }
 
   public static final class Constraints.Companion {
+    property public final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.ContentUriTrigger {
@@ -194,6 +196,8 @@
 
   public static final class Data.Companion {
     method @androidx.room.TypeConverter public androidx.work.Data fromByteArray(byte[] bytes);
+    property public final androidx.work.Data EMPTY;
+    property public static final int MAX_DATA_BYTES;
   }
 
   public final class DataKt {
@@ -358,6 +362,8 @@
   }
 
   public static final class PeriodicWorkRequest.Companion {
+    property public static final long MIN_PERIODIC_FLEX_MILLIS;
+    property public static final long MIN_PERIODIC_INTERVAL_MILLIS;
   }
 
   public final class PeriodicWorkRequestKt {
@@ -443,6 +449,24 @@
   }
 
   public static final class WorkInfo.Companion {
+    property public static final int STOP_REASON_APP_STANDBY;
+    property public static final int STOP_REASON_BACKGROUND_RESTRICTION;
+    property public static final int STOP_REASON_CANCELLED_BY_APP;
+    property public static final int STOP_REASON_CONSTRAINT_BATTERY_NOT_LOW;
+    property public static final int STOP_REASON_CONSTRAINT_CHARGING;
+    property public static final int STOP_REASON_CONSTRAINT_CONNECTIVITY;
+    property public static final int STOP_REASON_CONSTRAINT_DEVICE_IDLE;
+    property public static final int STOP_REASON_CONSTRAINT_STORAGE_NOT_LOW;
+    property public static final int STOP_REASON_DEVICE_STATE;
+    property public static final int STOP_REASON_ESTIMATED_APP_LAUNCH_TIME_CHANGED;
+    property public static final int STOP_REASON_FOREGROUND_SERVICE_TIMEOUT;
+    property public static final int STOP_REASON_NOT_STOPPED;
+    property public static final int STOP_REASON_PREEMPT;
+    property public static final int STOP_REASON_QUOTA;
+    property public static final int STOP_REASON_SYSTEM_PROCESSING;
+    property public static final int STOP_REASON_TIMEOUT;
+    property public static final int STOP_REASON_UNKNOWN;
+    property public static final int STOP_REASON_USER;
   }
 
   public static final class WorkInfo.PeriodicityInfo {
@@ -600,6 +624,9 @@
   }
 
   public static final class WorkRequest.Companion {
+    property public static final long DEFAULT_BACKOFF_DELAY_MILLIS;
+    property public static final long MAX_BACKOFF_MILLIS;
+    property public static final long MIN_BACKOFF_MILLIS;
   }
 
   public abstract class Worker extends androidx.work.ListenableWorker {
diff --git a/work/work-runtime/api/restricted_current.txt b/work/work-runtime/api/restricted_current.txt
index 97c561f..ec68d02 100644
--- a/work/work-runtime/api/restricted_current.txt
+++ b/work/work-runtime/api/restricted_current.txt
@@ -75,6 +75,7 @@
   }
 
   public static final class Configuration.Companion {
+    property public static final int MIN_SCHEDULER_LIMIT;
   }
 
   public static interface Configuration.Provider {
@@ -122,6 +123,7 @@
   }
 
   public static final class Constraints.Companion {
+    property public final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.ContentUriTrigger {
@@ -194,6 +196,8 @@
 
   public static final class Data.Companion {
     method @androidx.room.TypeConverter public androidx.work.Data fromByteArray(byte[] bytes);
+    property public final androidx.work.Data EMPTY;
+    property public static final int MAX_DATA_BYTES;
   }
 
   public final class DataKt {
@@ -358,6 +362,8 @@
   }
 
   public static final class PeriodicWorkRequest.Companion {
+    property public static final long MIN_PERIODIC_FLEX_MILLIS;
+    property public static final long MIN_PERIODIC_INTERVAL_MILLIS;
   }
 
   public final class PeriodicWorkRequestKt {
@@ -443,6 +449,24 @@
   }
 
   public static final class WorkInfo.Companion {
+    property public static final int STOP_REASON_APP_STANDBY;
+    property public static final int STOP_REASON_BACKGROUND_RESTRICTION;
+    property public static final int STOP_REASON_CANCELLED_BY_APP;
+    property public static final int STOP_REASON_CONSTRAINT_BATTERY_NOT_LOW;
+    property public static final int STOP_REASON_CONSTRAINT_CHARGING;
+    property public static final int STOP_REASON_CONSTRAINT_CONNECTIVITY;
+    property public static final int STOP_REASON_CONSTRAINT_DEVICE_IDLE;
+    property public static final int STOP_REASON_CONSTRAINT_STORAGE_NOT_LOW;
+    property public static final int STOP_REASON_DEVICE_STATE;
+    property public static final int STOP_REASON_ESTIMATED_APP_LAUNCH_TIME_CHANGED;
+    property public static final int STOP_REASON_FOREGROUND_SERVICE_TIMEOUT;
+    property public static final int STOP_REASON_NOT_STOPPED;
+    property public static final int STOP_REASON_PREEMPT;
+    property public static final int STOP_REASON_QUOTA;
+    property public static final int STOP_REASON_SYSTEM_PROCESSING;
+    property public static final int STOP_REASON_TIMEOUT;
+    property public static final int STOP_REASON_UNKNOWN;
+    property public static final int STOP_REASON_USER;
   }
 
   public static final class WorkInfo.PeriodicityInfo {
@@ -600,6 +624,9 @@
   }
 
   public static final class WorkRequest.Companion {
+    property public static final long DEFAULT_BACKOFF_DELAY_MILLIS;
+    property public static final long MAX_BACKOFF_MILLIS;
+    property public static final long MIN_BACKOFF_MILLIS;
   }
 
   public abstract class Worker extends androidx.work.ListenableWorker {