Made DUMBBELL_* and BENCH_SIT_UP internal
Currently we have some ExerciseTypes that have been flagged for internal
review. For example, some of the DUMBELL exercise types have left arm
and right arm variants, some do not, and some have TWO_ARM variants. So,
they have an issue with consistency. Additionally, their behavior is not
well documented what should happen when e.g. it's a RIGHT_ARM exercise,
but the watch is on the left arm.
BENCH_SIT_UP similarly needs some thought + documentation.
These were made internal rather than being removed to avoid extra object
creations when deserializing IPC from WHS Core.
Relnote: Removed DUMBBELL_* and BENCH_SIT_UP from API to iterate on them
Test: ./gradlew :health:health-services-client:test
Bug: 233397228
Change-Id: I0028d8d45aedd5e29441b4efc40b2eecf4f510e8
diff --git a/health/health-services-client/api/1.0.0-beta01.txt b/health/health-services-client/api/1.0.0-beta01.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/1.0.0-beta01.txt
+++ b/health/health-services-client/api/1.0.0-beta01.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/api/api_lint.ignore b/health/health-services-client/api/api_lint.ignore
index 692c66a..ded5bc40 100644
--- a/health/health-services-client/api/api_lint.ignore
+++ b/health/health-services-client/api/api_lint.ignore
@@ -23,8 +23,6 @@
Invalid nullability on parameter `intent` in method `onBind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
InvalidNullabilityOverride: androidx.health.services.client.VersionApiService#onBind(android.content.Intent):
Invalid nullability on method `onBind` return. Overrides of unannotated super method cannot be Nullable.
-InvalidNullabilityOverride: androidx.health.services.client.data.ProtoParcelable#writeToParcel(android.os.Parcel, int) parameter #0:
- Invalid nullability on parameter `dest` in method `writeToParcel`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
PairedRegistration: androidx.health.services.client.MeasureClient#registerMeasureCallback(androidx.health.services.client.data.DeltaDataType<?,?>, androidx.health.services.client.MeasureCallback):
diff --git a/health/health-services-client/api/current.txt b/health/health-services-client/api/current.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/current.txt
+++ b/health/health-services-client/api/current.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/api/public_plus_experimental_1.0.0-beta01.txt b/health/health-services-client/api/public_plus_experimental_1.0.0-beta01.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/public_plus_experimental_1.0.0-beta01.txt
+++ b/health/health-services-client/api/public_plus_experimental_1.0.0-beta01.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/api/public_plus_experimental_current.txt b/health/health-services-client/api/public_plus_experimental_current.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/public_plus_experimental_current.txt
+++ b/health/health-services-client/api/public_plus_experimental_current.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/api/restricted_1.0.0-beta01.txt b/health/health-services-client/api/restricted_1.0.0-beta01.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/restricted_1.0.0-beta01.txt
+++ b/health/health-services-client/api/restricted_1.0.0-beta01.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/api/restricted_current.txt b/health/health-services-client/api/restricted_current.txt
index 56bfe2d..a170f81 100644
--- a/health/health-services-client/api/restricted_current.txt
+++ b/health/health-services-client/api/restricted_current.txt
@@ -451,7 +451,6 @@
field public static final androidx.health.services.client.data.ExerciseType BASEBALL;
field public static final androidx.health.services.client.data.ExerciseType BASKETBALL;
field public static final androidx.health.services.client.data.ExerciseType BENCH_PRESS;
- field public static final androidx.health.services.client.data.ExerciseType BENCH_SIT_UP;
field public static final androidx.health.services.client.data.ExerciseType BIKING;
field public static final androidx.health.services.client.data.ExerciseType BIKING_STATIONARY;
field public static final androidx.health.services.client.data.ExerciseType BOOT_CAMP;
@@ -464,13 +463,6 @@
field public static final androidx.health.services.client.data.ExerciseType.Companion Companion;
field public static final androidx.health.services.client.data.ExerciseType DANCING;
field public static final androidx.health.services.client.data.ExerciseType DEADLIFT;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_CURL_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_FRONT_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_LATERAL_RAISE;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM;
- field public static final androidx.health.services.client.data.ExerciseType DUMBBELL_TRICEPS_EXTENSION_TWO_ARM;
field public static final androidx.health.services.client.data.ExerciseType ELLIPTICAL;
field public static final androidx.health.services.client.data.ExerciseType EXERCISE_CLASS;
field public static final androidx.health.services.client.data.ExerciseType FENCING;
diff --git a/health/health-services-client/src/main/java/androidx/health/services/client/data/ExerciseType.kt b/health/health-services-client/src/main/java/androidx/health/services/client/data/ExerciseType.kt
index 6716a53..5f9affbe 100644
--- a/health/health-services-client/src/main/java/androidx/health/services/client/data/ExerciseType.kt
+++ b/health/health-services-client/src/main/java/androidx/health/services/client/data/ExerciseType.kt
@@ -63,7 +63,7 @@
@JvmField public val BASEBALL: ExerciseType = ExerciseType(4, "BASEBALL")
@JvmField public val BASKETBALL: ExerciseType = ExerciseType(5, "BASKETBALL")
@JvmField public val BENCH_PRESS: ExerciseType = ExerciseType(6, "BENCH_PRESS")
- @JvmField public val BENCH_SIT_UP: ExerciseType = ExerciseType(7, "BENCH_SIT_UP")
+ @JvmField internal val BENCH_SIT_UP: ExerciseType = ExerciseType(7, "BENCH_SIT_UP")
@JvmField public val BIKING: ExerciseType = ExerciseType(8, "BIKING")
@JvmField public val BIKING_STATIONARY: ExerciseType = ExerciseType(9, "BIKING_STATIONARY")
@JvmField public val BOOT_CAMP: ExerciseType = ExerciseType(10, "BOOT_CAMP")
@@ -79,22 +79,24 @@
@JvmField public val DANCING: ExerciseType = ExerciseType(16, "DANCING")
@JvmField public val DEADLIFT: ExerciseType = ExerciseType(17, "DEADLIFT")
@JvmField
- public val DUMBBELL_CURL_RIGHT_ARM: ExerciseType =
+ internal val DUMBBELL_CURL_RIGHT_ARM: ExerciseType =
ExerciseType(18, "DUMBBELL_CURL_RIGHT_ARM")
@JvmField
- public val DUMBBELL_CURL_LEFT_ARM: ExerciseType = ExerciseType(19, "DUMBBELL_CURL_LEFT_ARM")
+ internal val DUMBBELL_CURL_LEFT_ARM: ExerciseType =
+ ExerciseType(19, "DUMBBELL_CURL_LEFT_ARM")
@JvmField
- public val DUMBBELL_FRONT_RAISE: ExerciseType = ExerciseType(20, "DUMBBELL_FRONT_RAISE")
+ internal val DUMBBELL_FRONT_RAISE: ExerciseType = ExerciseType(20, "DUMBBELL_FRONT_RAISE")
@JvmField
- public val DUMBBELL_LATERAL_RAISE: ExerciseType = ExerciseType(21, "DUMBBELL_LATERAL_RAISE")
+ internal val DUMBBELL_LATERAL_RAISE: ExerciseType =
+ ExerciseType(21, "DUMBBELL_LATERAL_RAISE")
@JvmField
- public val DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM: ExerciseType =
+ internal val DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM: ExerciseType =
ExerciseType(22, "DUMBBELL_TRICEPS_EXTENSION_LEFT_ARM")
@JvmField
- public val DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM: ExerciseType =
+ internal val DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM: ExerciseType =
ExerciseType(23, "DUMBBELL_TRICEPS_EXTENSION_RIGHT_ARM")
@JvmField
- public val DUMBBELL_TRICEPS_EXTENSION_TWO_ARM: ExerciseType =
+ internal val DUMBBELL_TRICEPS_EXTENSION_TWO_ARM: ExerciseType =
ExerciseType(24, "DUMBBELL_TRICEPS_EXTENSION_TWO_ARM")
@JvmField public val ELLIPTICAL: ExerciseType = ExerciseType(25, "ELLIPTICAL")
@JvmField public val EXERCISE_CLASS: ExerciseType = ExerciseType(26, "EXERCISE_CLASS")
