Merge "Move health-connect-* into its own group ID: androidx.health.connect" into androidx-main
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 582f65c..0d6ca9a 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -158,8 +158,8 @@
docs(project(":glance:glance-wear-tiles"))
docs(project(":graphics:graphics-core"))
docs(project(":gridlayout:gridlayout"))
- docs(project(":health:health-connect-client"))
- samples(project(":health:health-connect-client-samples"))
+ docs(project(":health:connect:connect-client"))
+ samples(project(":health:connect:connect-client-samples"))
docs(project(":health:health-services-client"))
docs(project(":heifwriter:heifwriter"))
docs(project(":hilt:hilt-common"))
diff --git a/health/health-connect-client-proto/build.gradle b/health/connect/connect-client-proto/build.gradle
similarity index 98%
rename from health/health-connect-client-proto/build.gradle
rename to health/connect/connect-client-proto/build.gradle
index a234b6f..507a245 100644
--- a/health/health-connect-client-proto/build.gradle
+++ b/health/connect/connect-client-proto/build.gradle
@@ -86,7 +86,7 @@
androidx {
name = "AndroidX Health Connect Client Proto"
publish = Publish.NONE
- mavenGroup = LibraryGroups.HEALTH
+ mavenGroup = LibraryGroups.HEALTH_CONNECT
inceptionYear = "2022"
description = "Proto files for health-connect-client"
}
diff --git a/health/health-connect-client-proto/src/main/proto/change.proto b/health/connect/connect-client-proto/src/main/proto/change.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/change.proto
rename to health/connect/connect-client-proto/src/main/proto/change.proto
diff --git a/health/health-connect-client-proto/src/main/proto/data.proto b/health/connect/connect-client-proto/src/main/proto/data.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/data.proto
rename to health/connect/connect-client-proto/src/main/proto/data.proto
diff --git a/health/health-connect-client-proto/src/main/proto/error.proto b/health/connect/connect-client-proto/src/main/proto/error.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/error.proto
rename to health/connect/connect-client-proto/src/main/proto/error.proto
diff --git a/health/health-connect-client-proto/src/main/proto/permission.proto b/health/connect/connect-client-proto/src/main/proto/permission.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/permission.proto
rename to health/connect/connect-client-proto/src/main/proto/permission.proto
diff --git a/health/health-connect-client-proto/src/main/proto/request.proto b/health/connect/connect-client-proto/src/main/proto/request.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/request.proto
rename to health/connect/connect-client-proto/src/main/proto/request.proto
diff --git a/health/health-connect-client-proto/src/main/proto/response.proto b/health/connect/connect-client-proto/src/main/proto/response.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/response.proto
rename to health/connect/connect-client-proto/src/main/proto/response.proto
diff --git a/health/health-connect-client-proto/src/main/proto/time.proto b/health/connect/connect-client-proto/src/main/proto/time.proto
similarity index 100%
rename from health/health-connect-client-proto/src/main/proto/time.proto
rename to health/connect/connect-client-proto/src/main/proto/time.proto
diff --git a/health/health-connect-client/OWNERS b/health/connect/connect-client/OWNERS
similarity index 100%
rename from health/health-connect-client/OWNERS
rename to health/connect/connect-client/OWNERS
diff --git a/health/health-connect-client/api/current.txt b/health/connect/connect-client/api/current.txt
similarity index 100%
rename from health/health-connect-client/api/current.txt
rename to health/connect/connect-client/api/current.txt
diff --git a/health/health-connect-client/api/public_plus_experimental_current.txt b/health/connect/connect-client/api/public_plus_experimental_current.txt
similarity index 100%
rename from health/health-connect-client/api/public_plus_experimental_current.txt
rename to health/connect/connect-client/api/public_plus_experimental_current.txt
diff --git a/health/health-connect-client/api/res-current.txt b/health/connect/connect-client/api/res-current.txt
similarity index 100%
rename from health/health-connect-client/api/res-current.txt
rename to health/connect/connect-client/api/res-current.txt
diff --git a/health/health-connect-client/api/restricted_current.txt b/health/connect/connect-client/api/restricted_current.txt
similarity index 100%
rename from health/health-connect-client/api/restricted_current.txt
rename to health/connect/connect-client/api/restricted_current.txt
diff --git a/health/health-connect-client/build.gradle b/health/connect/connect-client/build.gradle
similarity index 92%
rename from health/health-connect-client/build.gradle
rename to health/connect/connect-client/build.gradle
index a0550e3..6352024 100644
--- a/health/health-connect-client/build.gradle
+++ b/health/connect/connect-client/build.gradle
@@ -36,7 +36,7 @@
api("androidx.activity:activity:1.2.0")
api("androidx.annotation:annotation:1.2.0")
bundleInside(project(
- path: ":health:health-connect-client-proto",
+ path: ":health:connect:connect-client-proto",
configuration: "export"
))
implementation(libs.guavaListenableFuture)
@@ -57,7 +57,7 @@
testImplementation(libs.espressoCore)
testImplementation(libs.espressoIntents)
- samples(project(":health:health-connect-client-samples"))
+ samples(project(":health:connect:connect-client-samples"))
}
android {
@@ -77,8 +77,7 @@
androidx {
name = "AndroidX Health Connect Client Library"
type = LibraryType.PUBLISHED_LIBRARY
- mavenVersion = LibraryVersions.HEALTH_CONNECT_CLIENT
- mavenGroup = LibraryGroups.HEALTH
+ mavenGroup = LibraryGroups.HEALTH_CONNECT
inceptionYear = "2022"
description = "read or write user's health and fitness records."
}
diff --git a/health/health-connect-client/lint-baseline.xml b/health/connect/connect-client/lint-baseline.xml
similarity index 100%
rename from health/health-connect-client/lint-baseline.xml
rename to health/connect/connect-client/lint-baseline.xml
diff --git a/health/health-connect-client/proguard-rules.pro b/health/connect/connect-client/proguard-rules.pro
similarity index 100%
rename from health/health-connect-client/proguard-rules.pro
rename to health/connect/connect-client/proguard-rules.pro
diff --git a/health/health-connect-client/samples/build.gradle b/health/connect/connect-client/samples/build.gradle
similarity index 89%
rename from health/health-connect-client/samples/build.gradle
rename to health/connect/connect-client/samples/build.gradle
index 1fa6318..c4a7974 100644
--- a/health/health-connect-client/samples/build.gradle
+++ b/health/connect/connect-client/samples/build.gradle
@@ -28,7 +28,7 @@
implementation(libs.kotlinStdlib)
compileOnly projectOrArtifact(":annotation:annotation-sampled")
- implementation project(":health:health-connect-client")
+ implementation project(":health:connect:connect-client")
implementation project(":appcompat:appcompat")
implementation project(":activity:activity")
}
@@ -36,8 +36,7 @@
androidx {
name = "AndroidX Health Connect Library Samples"
type = LibraryType.SAMPLES
- mavenVersion = LibraryVersions.HEALTH_CONNECT_CLIENT
- mavenGroup = LibraryGroups.HEALTH
+ mavenGroup = LibraryGroups.HEALTH_CONNECT
inceptionYear = "2022"
description = "Contains the sample code for the Androidx Health Connect Library"
}
@@ -47,4 +46,4 @@
defaultConfig {
minSdkVersion 26
}
-}
\ No newline at end of file
+}
diff --git a/health/health-connect-client/samples/src/main/AndroidManifest.xml b/health/connect/connect-client/samples/src/main/AndroidManifest.xml
similarity index 100%
rename from health/health-connect-client/samples/src/main/AndroidManifest.xml
rename to health/connect/connect-client/samples/src/main/AndroidManifest.xml
diff --git a/health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/AggregationSamples.kt b/health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/AggregationSamples.kt
similarity index 100%
rename from health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/AggregationSamples.kt
rename to health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/AggregationSamples.kt
diff --git a/health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/DeleteRecordsSamples.kt b/health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/DeleteRecordsSamples.kt
similarity index 100%
rename from health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/DeleteRecordsSamples.kt
rename to health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/DeleteRecordsSamples.kt
diff --git a/health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/InsertRecordsSamples.kt b/health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/InsertRecordsSamples.kt
similarity index 100%
rename from health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/InsertRecordsSamples.kt
rename to health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/InsertRecordsSamples.kt
diff --git a/health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/PermissionSamples.kt b/health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/PermissionSamples.kt
similarity index 100%
rename from health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/PermissionSamples.kt
rename to health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/PermissionSamples.kt
diff --git a/health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/ReadRecordsSamples.kt b/health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/ReadRecordsSamples.kt
similarity index 100%
rename from health/health-connect-client/samples/src/main/java/androidx/health/connect/client/samples/ReadRecordsSamples.kt
rename to health/connect/connect-client/samples/src/main/java/androidx/health/connect/client/samples/ReadRecordsSamples.kt
diff --git a/health/health-connect-client/src/androidTest/AndroidManifest.xml b/health/connect/connect-client/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from health/health-connect-client/src/androidTest/AndroidManifest.xml
rename to health/connect/connect-client/src/androidTest/AndroidManifest.xml
diff --git a/health/health-connect-client/src/main/AndroidManifest.xml b/health/connect/connect-client/src/main/AndroidManifest.xml
similarity index 100%
rename from health/health-connect-client/src/main/AndroidManifest.xml
rename to health/connect/connect-client/src/main/AndroidManifest.xml
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/permission/Permission.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/permission/Permission.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/permission/Permission.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/permission/Permission.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl
diff --git a/health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl b/health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl
similarity index 100%
rename from health/health-connect-client/src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl
rename to health/connect/connect-client/src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/PermissionController.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/PermissionController.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/PermissionController.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/PermissionController.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregateMetric.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregateMetric.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregateMetric.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregateMetric.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResult.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResult.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResult.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResult.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByDuration.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByDuration.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByDuration.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByDuration.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriod.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriod.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriod.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriod.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/changes/Change.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/Change.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/changes/Change.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/Change.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/changes/ChangesEvent.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/ChangesEvent.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/changes/ChangesEvent.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/ChangesEvent.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/changes/DeletionChange.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/DeletionChange.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/changes/DeletionChange.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/DeletionChange.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/changes/UpsertionChange.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/UpsertionChange.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/changes/UpsertionChange.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/changes/UpsertionChange.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/health-data-client-documentation.md b/health/connect/connect-client/src/main/java/androidx/health/connect/client/health-data-client-documentation.md
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/health-data-client-documentation.md
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/health-data-client-documentation.md
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/HealthConnectClientImpl.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/HealthConnectClientImpl.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/HealthConnectClientImpl.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/HealthConnectClientImpl.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricToProto.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricToProto.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricToProto.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricToProto.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/ProtoToAggregateDataRow.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/ProtoToAggregateDataRow.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/ProtoToAggregateDataRow.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/aggregate/ProtoToAggregateDataRow.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/changes/ChangesEventConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/changes/ChangesEventConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/changes/ChangesEventConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/changes/ChangesEventConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeIdPairConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeIdPairConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeIdPairConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/DataTypeIdPairConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMap.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMap.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMap.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMap.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/permission/PermissionConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/permission/PermissionConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/permission/PermissionConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/permission/PermissionConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordConverters.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordConverters.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordConverters.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordConverters.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordUtils.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordUtils.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordUtils.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ProtoToRecordUtils.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoConverters.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoConverters.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoConverters.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoConverters.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoUtils.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoUtils.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoUtils.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/RecordToProtoUtils.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ValueExt.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ValueExt.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ValueExt.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/records/ValueExt.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/AggregateRequestToProto.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/AggregateRequestToProto.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/AggregateRequestToProto.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/AggregateRequestToProto.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/DeleteDataRangeRequestToProto.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/DeleteDataRangeRequestToProto.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/DeleteDataRangeRequestToProto.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/DeleteDataRangeRequestToProto.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRangeRequestToProto.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRangeRequestToProto.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRangeRequestToProto.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRangeRequestToProto.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRequestToProto.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRequestToProto.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRequestToProto.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/request/ReadDataRequestToProto.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToChangesResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToChangesResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToChangesResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToChangesResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToReadRecordsResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToReadRecordsResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToReadRecordsResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/response/ProtoToReadRecordsResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/time/TimeRangeFilterConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/time/TimeRangeFilterConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/converters/time/TimeRangeFilterConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/converters/time/TimeRangeFilterConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/impl/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/impl/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/impl/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/connect/client/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/AccessTypes.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/AccessTypes.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/permission/AccessTypes.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/AccessTypes.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthPermission.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/HealthPermission.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthPermission.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/permission/HealthPermission.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ActiveCaloriesBurnedRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ActiveCaloriesBurnedRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ActiveCaloriesBurnedRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ActiveCaloriesBurnedRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BasalBodyTemperatureRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BasalBodyTemperatureRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BasalBodyTemperatureRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BasalBodyTemperatureRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BasalMetabolicRateRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BasalMetabolicRateRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BasalMetabolicRateRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BasalMetabolicRateRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BloodGlucoseRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BloodGlucoseRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BloodGlucoseRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BloodGlucoseRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BloodPressureRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BloodPressureRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BloodPressureRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BloodPressureRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyFatRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyFatRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyFatRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyFatRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyPosition.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyPosition.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyPosition.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyPosition.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureMeasurementLocation.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureMeasurementLocation.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureMeasurementLocation.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureMeasurementLocation.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyTemperatureRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyWaterMassRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyWaterMassRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BodyWaterMassRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BodyWaterMassRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/BoneMassRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BoneMassRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/BoneMassRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/BoneMassRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/CervicalMucusRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/CervicalMucusRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/CervicalMucusRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/CervicalMucusRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/CyclingPedalingCadenceRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/CyclingPedalingCadenceRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/CyclingPedalingCadenceRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/CyclingPedalingCadenceRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/DistanceRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/DistanceRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/DistanceRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/DistanceRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ElevationGainedRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ElevationGainedRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ElevationGainedRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ElevationGainedRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseEventRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseEventRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseEventRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseEventRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseLapRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseLapRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseLapRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseLapRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseRepetitionsRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseRepetitionsRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseRepetitionsRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseRepetitionsRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseSessionRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseSessionRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/ExerciseSessionRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/ExerciseSessionRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/FloorsClimbedRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/FloorsClimbedRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/FloorsClimbedRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/FloorsClimbedRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityDifferentialIndexRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityDifferentialIndexRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityDifferentialIndexRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityDifferentialIndexRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityRmssdRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityRmssdRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityRmssdRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityRmssdRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySd2Record.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySd2Record.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySd2Record.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySd2Record.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdannRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdannRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdannRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdannRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnIndexRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnIndexRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnIndexRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnIndexRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdnnRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdsdRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdsdRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdsdRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilitySdsdRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityTinnRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityTinnRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityTinnRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeartRateVariabilityTinnRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeightRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeightRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HeightRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HeightRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HipCircumferenceRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HipCircumferenceRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HipCircumferenceRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HipCircumferenceRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/HydrationRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HydrationRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/HydrationRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/HydrationRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/InstantaneousRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/InstantaneousRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/InstantaneousRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/InstantaneousRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/IntervalRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/IntervalRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/IntervalRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/IntervalRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/LeanBodyMassRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/LeanBodyMassRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/LeanBodyMassRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/LeanBodyMassRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/MealType.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/MealType.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/MealType.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/MealType.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/MenstruationRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/MenstruationRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/MenstruationRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/MenstruationRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/NutritionRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/NutritionRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/NutritionRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/NutritionRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/OvulationTestRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/OvulationTestRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/OvulationTestRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/OvulationTestRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/OxygenSaturationRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/OxygenSaturationRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/OxygenSaturationRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/OxygenSaturationRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/PowerRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/PowerRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/PowerRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/PowerRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/Record.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Record.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/Record.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Record.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/RelationToMeal.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RelationToMeal.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/RelationToMeal.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RelationToMeal.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/RespiratoryRateRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RespiratoryRateRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/RespiratoryRateRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RespiratoryRateRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/RestingHeartRateRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RestingHeartRateRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/RestingHeartRateRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/RestingHeartRateRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SeriesRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SeriesRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SeriesRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SeriesRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SexualActivityRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SexualActivityRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SexualActivityRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SexualActivityRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SleepSessionRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SleepSessionRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SleepSessionRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SleepSessionRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SleepStageRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SleepStageRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SleepStageRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SleepStageRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SpeedRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SpeedRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SpeedRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SpeedRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/StepsCadenceRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/StepsCadenceRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/StepsCadenceRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/StepsCadenceRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/StepsRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/StepsRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/StepsRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/StepsRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/SwimmingStrokesRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SwimmingStrokesRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/SwimmingStrokesRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/SwimmingStrokesRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/TotalCaloriesBurnedRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/TotalCaloriesBurnedRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/TotalCaloriesBurnedRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/TotalCaloriesBurnedRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/Utils.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Utils.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/Utils.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Utils.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/Vo2MaxRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Vo2MaxRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/Vo2MaxRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/Vo2MaxRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/WaistCircumferenceRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WaistCircumferenceRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/WaistCircumferenceRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WaistCircumferenceRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/WeightRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WeightRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/WeightRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WeightRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/WheelchairPushesRecord.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WheelchairPushesRecord.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/WheelchairPushesRecord.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/WheelchairPushesRecord.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/DataOrigin.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/DataOrigin.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/DataOrigin.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/DataOrigin.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/Device.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/Device.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/Device.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/Device.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/DeviceType.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/DeviceType.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/DeviceType.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/DeviceType.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/Metadata.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/Metadata.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/Metadata.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/Metadata.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/metadata/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/metadata/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/records/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/connect/client/records/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/records/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/records/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByDurationRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByDurationRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByDurationRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByDurationRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByPeriodRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByPeriodRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByPeriodRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateGroupByPeriodRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/request/AggregateRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/request/AggregateRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/request/ChangesTokenRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/request/ChangesTokenRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/request/ChangesTokenRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/request/ChangesTokenRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/request/ReadRecordsRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/request/ReadRecordsRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/request/ReadRecordsRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/request/ReadRecordsRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/response/ChangesResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ChangesResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/response/ChangesResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ChangesResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/response/InsertRecordsResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/response/InsertRecordsResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/response/InsertRecordsResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/response/InsertRecordsResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordsResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordsResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordsResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/response/ReadRecordsResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/time/TimeRangeFilter.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/time/TimeRangeFilter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/time/TimeRangeFilter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/time/TimeRangeFilter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Energy.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Energy.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Energy.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Energy.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Length.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Length.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Length.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Length.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Mass.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Mass.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Mass.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Mass.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Percentage.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Percentage.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Percentage.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Percentage.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Power.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Power.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Power.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Power.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Pressure.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Pressure.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Pressure.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Pressure.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Temperature.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Temperature.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Temperature.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Temperature.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Velocity.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Velocity.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Velocity.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Velocity.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/units/Volume.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Volume.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/connect/client/units/Volume.kt
rename to health/connect/connect-client/src/main/java/androidx/health/connect/client/units/Volume.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/HealthDataAsyncClient.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/HealthDataAsyncClient.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/HealthDataAsyncClient.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/HealthDataAsyncClient.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/HealthDataService.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/HealthDataService.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/HealthDataService.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/HealthDataService.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/SdkConfig.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/SdkConfig.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/SdkConfig.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/SdkConfig.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/changes/ChangesEvent.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/changes/ChangesEvent.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/changes/ChangesEvent.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/changes/ChangesEvent.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/error/ErrorCode.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/error/ErrorCode.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/error/ErrorCode.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/error/ErrorCode.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/error/ErrorStatus.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/error/ErrorStatus.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/error/ErrorStatus.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/error/ErrorStatus.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/AggregateDataCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/AggregateDataCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/AggregateDataCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/AggregateDataCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ClearOnChangesListenerCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ClearOnChangesListenerCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ClearOnChangesListenerCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ClearOnChangesListenerCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataRangeCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataRangeCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataRangeCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/DeleteDataRangeCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesTokenCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesTokenCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesTokenCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetChangesTokenCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetGrantedPermissionsCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetGrantedPermissionsCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/GetGrantedPermissionsCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/GetGrantedPermissionsCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/InsertDataCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/InsertDataCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/InsertDataCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/InsertDataCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/OnChangesListenerProxy.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/OnChangesListenerProxy.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/OnChangesListenerProxy.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/OnChangesListenerProxy.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataRangeCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataRangeCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataRangeCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ReadDataRangeCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/RevokeAllPermissionsCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/RevokeAllPermissionsCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/RevokeAllPermissionsCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/RevokeAllPermissionsCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClient.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClient.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClient.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClient.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/SetOnChangesListenerCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/SetOnChangesListenerCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/SetOnChangesListenerCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/SetOnChangesListenerCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/UpdateDataCallback.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/UpdateDataCallback.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/UpdateDataCallback.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/UpdateDataCallback.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoData.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoData.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoData.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoData.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoParcelable.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoParcelable.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoParcelable.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/ProtoParcelable.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/data/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/error/ErrorStatusConverter.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/error/ErrorStatusConverter.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/error/ErrorStatusConverter.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/error/ErrorStatusConverter.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/error/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/error/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/error/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/error/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/internal/ProviderConnectionManager.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/internal/ProviderConnectionManager.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/internal/ProviderConnectionManager.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/internal/ProviderConnectionManager.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ApiVersionException.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ApiVersionException.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ApiVersionException.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ApiVersionException.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/Client.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/Client.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/Client.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/Client.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ClientConfiguration.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteFutureOperation.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteOperation.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteOperation.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteOperation.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/RemoteOperation.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/ServiceOperation.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/BaseQueueOperation.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/BaseQueueOperation.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/BaseQueueOperation.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/BaseQueueOperation.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionConfiguration.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ConnectionManager.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/DefaultExecutionTracker.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ExecutionTracker.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ListenerKey.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/QueueOperation.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnection.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/ipc/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/ipc/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/logger/Logger.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/logger/Logger.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/logger/Logger.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/logger/Logger.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/ForegroundStateChecker.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/ForegroundStateChecker.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/ForegroundStateChecker.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/ForegroundStateChecker.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/foregroundstate/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManager.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManager.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManager.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManager.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/permission/token/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkService.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkService.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkService.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkService.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImpl.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImpl.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImpl.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImpl.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/sdkservice/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/permission/Permission.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/permission/Permission.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/permission/Permission.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/permission/Permission.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/permission/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/permission/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/permission/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/permission/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/proto/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/proto/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/proto/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/proto/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/AggregateDataRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/AggregateDataRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/AggregateDataRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/AggregateDataRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRangeRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRangeRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRangeRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRangeRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/DeleteDataRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/GetChangesRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/GetChangesRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/GetChangesRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/GetChangesRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/GetChangesTokenRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/GetChangesTokenRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/GetChangesTokenRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/GetChangesTokenRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRangeRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRangeRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRangeRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRangeRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/ReadDataRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/RequestContext.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/RequestContext.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/RequestContext.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/RequestContext.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/UpsertDataRequest.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/UpsertDataRequest.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/UpsertDataRequest.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/UpsertDataRequest.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/request/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/request/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/request/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/request/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/AggregateDataResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/AggregateDataResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/AggregateDataResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/AggregateDataResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/GetChangesResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/GetChangesResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/GetChangesResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/GetChangesResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/GetChangesTokenResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/GetChangesTokenResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/GetChangesTokenResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/GetChangesTokenResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/InsertDataResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/InsertDataResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/InsertDataResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/InsertDataResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/ReadDataRangeResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/ReadDataRangeResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/ReadDataRangeResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/ReadDataRangeResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/ReadDataResponse.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/ReadDataResponse.kt
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/ReadDataResponse.kt
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/ReadDataResponse.kt
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/response/package-info.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/response/package-info.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/response/package-info.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/response/package-info.java
diff --git a/health/health-connect-client/src/main/java/androidx/health/platform/client/service/HealthDataServiceConstants.java b/health/connect/connect-client/src/main/java/androidx/health/platform/client/service/HealthDataServiceConstants.java
similarity index 100%
rename from health/health-connect-client/src/main/java/androidx/health/platform/client/service/HealthDataServiceConstants.java
rename to health/connect/connect-client/src/main/java/androidx/health/platform/client/service/HealthDataServiceConstants.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/HealthConnectClientTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriodTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriodTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriodTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/aggregate/AggregationResultGroupedByPeriodTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/HealthConnectClientImplTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregateMetricConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregationResultConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregationResultConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregationResultConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/aggregate/AggregationResultConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMapTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMapTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMapTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/datatype/RecordsTypeNameMapTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/AllRecordsConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/AllRecordsConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/AllRecordsConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/AllRecordsConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordAggregationsTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordAggregationsTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordAggregationsTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordAggregationsTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordsTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordsTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordsTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/records/RecordsTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/request/AggregateRequestConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/request/AggregateRequestConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/request/AggregateRequestConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/request/AggregateRequestConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/response/ChangesResponseConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/response/ChangesResponseConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/impl/converters/response/ChangesResponseConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/impl/converters/response/ChangesResponseConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/metadata/DeviceTypeTest.java b/health/connect/connect-client/src/test/java/androidx/health/connect/client/metadata/DeviceTypeTest.java
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/metadata/DeviceTypeTest.java
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/metadata/DeviceTypeTest.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/permission/HealthDataRequestPermissionsTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/permission/HealthDataRequestPermissionsTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/permission/HealthDataRequestPermissionsTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/permission/HealthDataRequestPermissionsTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/permission/HealthPermissionTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/permission/HealthPermissionTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/permission/HealthPermissionTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/permission/HealthPermissionTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/request/ReadRecordsRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/request/ReadRecordsRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/request/ReadRecordsRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/request/ReadRecordsRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/connect/client/time/TimeRangeFilterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/connect/client/time/TimeRangeFilterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/connect/client/time/TimeRangeFilterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/connect/client/time/TimeRangeFilterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/error/ErrorStatusTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/error/ErrorStatusTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/error/ErrorStatusTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/error/ErrorStatusTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ServiceBackedHealthDataClientTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/converters/permission/PermissionConverterTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/converters/permission/PermissionConverterTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/converters/permission/PermissionConverterTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/converters/permission/PermissionConverterTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/data/ProtoParcelableTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/data/ProtoParcelableTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/data/ProtoParcelableTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/data/ProtoParcelableTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnectionTest.java b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnectionTest.java
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnectionTest.java
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/ipc/internal/ServiceConnectionTest.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManagerTest.java b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManagerTest.java
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManagerTest.java
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/permission/token/PermissionTokenManagerTest.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImplTest.java b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImplTest.java
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImplTest.java
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceStubImplTest.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceTest.java b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceTest.java
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceTest.java
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/sdkservice/HealthDataSdkServiceTest.java
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/impl/testing/FakeHealthDataService.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/testing/FakeHealthDataService.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/impl/testing/FakeHealthDataService.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/impl/testing/FakeHealthDataService.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/permission/PermissionTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/permission/PermissionTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/permission/PermissionTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/permission/PermissionTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRangeRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRangeRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRangeRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRangeRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/DeleteDataRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRangeRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRangeRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRangeRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRangeRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/ReadDataRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/RequestContextTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/RequestContextTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/RequestContextTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/RequestContextTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/request/UpsertDataRequestTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/request/UpsertDataRequestTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/request/UpsertDataRequestTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/request/UpsertDataRequestTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/response/InsertDataResponseTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/response/InsertDataResponseTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/response/InsertDataResponseTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/response/InsertDataResponseTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/response/ReadDataRangeResponseTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/response/ReadDataRangeResponseTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/response/ReadDataRangeResponseTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/response/ReadDataRangeResponseTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/response/ReadDataResponseTest.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/response/ReadDataResponseTest.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/response/ReadDataResponseTest.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/response/ReadDataResponseTest.kt
diff --git a/health/health-connect-client/src/test/java/androidx/health/platform/client/testing/TestConstants.kt b/health/connect/connect-client/src/test/java/androidx/health/platform/client/testing/TestConstants.kt
similarity index 100%
rename from health/health-connect-client/src/test/java/androidx/health/platform/client/testing/TestConstants.kt
rename to health/connect/connect-client/src/test/java/androidx/health/platform/client/testing/TestConstants.kt
diff --git a/libraryversions.toml b/libraryversions.toml
index 55d15f9..85ca4b6a 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -54,7 +54,7 @@
GLANCE_TEMPLATE = "1.0.0-alpha01"
GRAPHICS = "1.0.0-alpha01"
GRIDLAYOUT = "1.1.0-alpha01"
-HEALTH_CONNECT_CLIENT = "1.0.0-alpha04"
+HEALTH_CONNECT = "1.0.0-alpha04"
HEALTH_SERVICES_CLIENT = "1.0.0-beta01"
HEIFWRITER = "1.1.0-alpha02"
HILT = "1.1.0-alpha01"
@@ -185,6 +185,7 @@
GRAPHICS = { group = "androidx.graphics", atomicGroupVersion = "versions.GRAPHICS" }
GRIDLAYOUT = { group = "androidx.gridlayout", atomicGroupVersion = "versions.GRIDLAYOUT" }
HEALTH = { group = "androidx.health" }
+HEALTH_CONNECT = { group = "androidx.health.connect", atomicGroupVersion = "versions.HEALTH_CONNECT" }
HEIFWRITER = { group = "androidx.heifwriter", atomicGroupVersion = "versions.HEIFWRITER" }
HILT = { group = "androidx.hilt" }
INSPECTION = { group = "androidx.inspection", atomicGroupVersion = "versions.INSPECTION" }
diff --git a/settings.gradle b/settings.gradle
index 7c1552f..2f3c35a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -656,9 +656,9 @@
includeProject(":glance:glance-wear-tiles", [BuildType.GLANCE])
includeProject(":glance:glance-wear-tiles-preview", [BuildType.GLANCE])
includeProject(":gridlayout:gridlayout", [BuildType.MAIN])
-includeProject(":health:health-connect-client", [BuildType.MAIN])
-includeProject(":health:health-connect-client-proto", [BuildType.MAIN])
-includeProject(":health:health-connect-client-samples", "health/health-connect-client/samples", [BuildType.MAIN])
+includeProject(":health:connect:connect-client", [BuildType.MAIN])
+includeProject(":health:connect:connect-client-proto", [BuildType.MAIN])
+includeProject(":health:connect:connect-client-samples", "health/connect/connect-client/samples", [BuildType.MAIN])
includeProject(":health:health-services-client", [BuildType.MAIN])
includeProject(":heifwriter:heifwriter", [BuildType.MAIN])
includeProject(":graphics:graphics-core", [BuildType.MAIN])
