Minor: Improve message in IllegalArgumentException.
BUG: 308098760
Change-Id: Id7b78f3da30f9875d4775c3b5b5343091539a249
diff --git a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ColorBuilders.java b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ColorBuilders.java
index 6b55c675..544b9c8 100644
--- a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ColorBuilders.java
+++ b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ColorBuilders.java
@@ -321,7 +321,8 @@
@NonNull
Builder setColor(@NonNull ColorProp color) {
if (color.getDynamicValue() != null) {
- throw new IllegalArgumentException("setColor doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "ColorStop.Builder.setColor doesn't support dynamic values.");
}
mImpl.setColor(color.toProto());
mFingerprint.recordPropertyUpdate(
@@ -341,7 +342,8 @@
@NonNull
Builder setOffset(@NonNull FloatProp offset) {
if (offset.getDynamicValue() != null) {
- throw new IllegalArgumentException("setOffset doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "ColorStop.Builder.setOffset doesn't support dynamic values.");
}
float value = offset.getValue();
if (value < 0f || value > 1f) {
@@ -541,7 +543,7 @@
public Builder setStartAngle(@NonNull DegreesProp startAngle) {
if (startAngle.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setStartAngle doesn't support dynamic values.");
+ "SweepGradient.Builder.setStartAngle doesn't support dynamic values.");
}
mImpl.setStartAngle(startAngle.toProto());
mFingerprint.recordPropertyUpdate(
@@ -566,7 +568,7 @@
public Builder setEndAngle(@NonNull DegreesProp endAngle) {
if (endAngle.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setEndAngle doesn't support dynamic values.");
+ "SweepGradient.Builder.setEndAngle doesn't support dynamic values.");
}
mImpl.setEndAngle(endAngle.toProto());
mFingerprint.recordPropertyUpdate(
diff --git a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/DimensionBuilders.java b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/DimensionBuilders.java
index 2fc0e2f..525958a 100644
--- a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/DimensionBuilders.java
+++ b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/DimensionBuilders.java
@@ -1032,7 +1032,8 @@
public Builder setLayoutWeight(@NonNull FloatProp layoutWeight) {
if (layoutWeight.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setLayoutWeight doesn't support dynamic values.");
+ "ExpandedDimensionProp.Builder.setLayoutWeight doesn't support dynamic"
+ + " values.");
}
mImpl.setLayoutWeight(layoutWeight.toProto());
mFingerprint.recordPropertyUpdate(
@@ -1142,7 +1143,8 @@
public Builder setMinimumSize(@NonNull DpProp minimumSize) {
if (minimumSize.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setMinimumSize doesn't support dynamic values.");
+ "WrappedDimensionProp.Builder.setMinimumSize doesn't support dynamic"
+ + " values.");
}
mImpl.setMinimumSize(minimumSize.toProto());
mFingerprint.recordPropertyUpdate(
diff --git a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/LayoutElementBuilders.java b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/LayoutElementBuilders.java
index 28eaf27..f353a88 100644
--- a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/LayoutElementBuilders.java
+++ b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/LayoutElementBuilders.java
@@ -2116,7 +2116,7 @@
public Builder setResourceId(@NonNull StringProp resourceId) {
if (resourceId.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setResourceId doesn't support dynamic values.");
+ "Image.Builder.setResourceId doesn't support dynamic values.");
}
mImpl.setResourceId(resourceId.toProto());
mFingerprint.recordPropertyUpdate(
@@ -3156,7 +3156,7 @@
public Builder setResourceId(@NonNull StringProp resourceId) {
if (resourceId.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setResourceId doesn't support dynamic values.");
+ "SpanImage.Builder.setResourceId doesn't support dynamic values.");
}
mImpl.setResourceId(resourceId.toProto());
mFingerprint.recordPropertyUpdate(
@@ -3185,7 +3185,8 @@
@NonNull
public Builder setWidth(@NonNull DpProp width) {
if (width.getDynamicValue() != null) {
- throw new IllegalArgumentException("setWidth doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "SpanImage.Builder.setWidth doesn't support dynamic values.");
}
mImpl.setWidth(width.toProto());
mFingerprint.recordPropertyUpdate(
@@ -3203,7 +3204,8 @@
@NonNull
public Builder setHeight(@NonNull DpProp height) {
if (height.getDynamicValue() != null) {
- throw new IllegalArgumentException("setHeight doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "SpanImage.Builder.setHeight doesn't support dynamic values.");
}
mImpl.setHeight(height.toProto());
mFingerprint.recordPropertyUpdate(
@@ -4530,7 +4532,8 @@
@NonNull
public Builder setText(@NonNull StringProp text) {
if (text.getDynamicValue() != null) {
- throw new IllegalArgumentException("setText doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "ArcText.Builder.setText doesn't support dynamic values.");
}
mImpl.setText(text.toProto());
mFingerprint.recordPropertyUpdate(
@@ -4813,7 +4816,7 @@
public Builder setThickness(@NonNull DpProp thickness) {
if (thickness.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setThickness doesn't support dynamic values.");
+ "ArcLine.Builder.setThickness doesn't support dynamic values.");
}
mImpl.setThickness(thickness.toProto());
mFingerprint.recordPropertyUpdate(
@@ -5141,7 +5144,8 @@
@NonNull
public Builder setLength(@NonNull DegreesProp length) {
if (length.getDynamicValue() != null) {
- throw new IllegalArgumentException("setLength doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "ArcSpacer.Builder.setLength doesn't support dynamic values.");
}
mImpl.setLength(length.toProto());
mFingerprint.recordPropertyUpdate(
@@ -5160,7 +5164,7 @@
public Builder setThickness(@NonNull DpProp thickness) {
if (thickness.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setThickness doesn't support dynamic values.");
+ "ArcSpacer.Builder.setThickness doesn't support dynamic values.");
}
mImpl.setThickness(thickness.toProto());
mFingerprint.recordPropertyUpdate(
diff --git a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ModifiersBuilders.java b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ModifiersBuilders.java
index e7be5de..dc5499b 100644
--- a/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ModifiersBuilders.java
+++ b/wear/protolayout/protolayout/src/main/java/androidx/wear/protolayout/ModifiersBuilders.java
@@ -480,7 +480,8 @@
public Builder setMinimumClickableWidth(@NonNull DpProp minimumClickableWidth) {
if (minimumClickableWidth.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setMinimumClickableWidth doesn't support dynamic values.");
+ "Clickable.Builder.setMinimumClickableWidth doesn't support dynamic"
+ + " values.");
}
mImpl.setMinimumClickableWidth(minimumClickableWidth.toProto());
mFingerprint.recordPropertyUpdate(
@@ -505,7 +506,8 @@
public Builder setMinimumClickableHeight(@NonNull DpProp minimumClickableHeight) {
if (minimumClickableHeight.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setMinimumClickableHeight doesn't support dynamic values.");
+ "Clickable.Builder.setMinimumClickableHeight doesn't support dynamic"
+ + " values.");
}
mImpl.setMinimumClickableHeight(minimumClickableHeight.toProto());
mFingerprint.recordPropertyUpdate(
@@ -857,7 +859,8 @@
@NonNull
public Builder setEnd(@NonNull DpProp end) {
if (end.getDynamicValue() != null) {
- throw new IllegalArgumentException("setEnd doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Padding.Builder.setEnd doesn't support dynamic values.");
}
mImpl.setEnd(end.toProto());
mFingerprint.recordPropertyUpdate(
@@ -876,7 +879,8 @@
@NonNull
public Builder setStart(@NonNull DpProp start) {
if (start.getDynamicValue() != null) {
- throw new IllegalArgumentException("setStart doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Padding.Builder.setStart doesn't support dynamic values.");
}
mImpl.setStart(start.toProto());
mFingerprint.recordPropertyUpdate(
@@ -894,7 +898,8 @@
@NonNull
public Builder setTop(@NonNull DpProp top) {
if (top.getDynamicValue() != null) {
- throw new IllegalArgumentException("setTop doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Padding.Builder.setTop doesn't support dynamic values.");
}
mImpl.setTop(top.toProto());
mFingerprint.recordPropertyUpdate(
@@ -912,7 +917,8 @@
@NonNull
public Builder setBottom(@NonNull DpProp bottom) {
if (bottom.getDynamicValue() != null) {
- throw new IllegalArgumentException("setBottom doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Padding.Builder.setBottom doesn't support dynamic values.");
}
mImpl.setBottom(bottom.toProto());
mFingerprint.recordPropertyUpdate(
@@ -1065,7 +1071,8 @@
@NonNull
public Builder setWidth(@NonNull DpProp width) {
if (width.getDynamicValue() != null) {
- throw new IllegalArgumentException("setWidth doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Border.Builder.setWidth doesn't support dynamic values.");
}
mImpl.setWidth(width.toProto());
mFingerprint.recordPropertyUpdate(
@@ -1176,7 +1183,8 @@
@NonNull
public Builder setRadius(@NonNull DpProp radius) {
if (radius.getDynamicValue() != null) {
- throw new IllegalArgumentException("setRadius doesn't support dynamic values.");
+ throw new IllegalArgumentException(
+ "Corner.Builder.setRadius doesn't support dynamic values.");
}
mImpl.setRadius(radius.toProto());
mFingerprint.recordPropertyUpdate(
@@ -3109,7 +3117,7 @@
public Builder setBlurRadius(@NonNull DpProp blurRadius) {
if (blurRadius.getDynamicValue() != null) {
throw new IllegalArgumentException(
- "setBlurRadius doesn't support dynamic values.");
+ "Shadow.Builder.setBlurRadius doesn't support dynamic values.");
}
mImpl.setBlurRadius(blurRadius.toProto());
mFingerprint.recordPropertyUpdate(
