Rename setAndroidResourceByResid to setAndroidResourceByResId.
Relnote: "Renamed ImageResource#setAndroidResourceByResid to
setAndroidResourceByResId"
Bug: 186542478
Test: Pure refactor, existing tests pass
Change-Id: I4ba6e3f4a956f715cc98b323b628fc69b4076f79
diff --git a/wear/tiles/tiles-proto/src/main/proto/resources.proto b/wear/tiles/tiles-proto/src/main/proto/resources.proto
index babb7d8..652e130 100644
--- a/wear/tiles/tiles-proto/src/main/proto/resources.proto
+++ b/wear/tiles/tiles-proto/src/main/proto/resources.proto
@@ -49,7 +49,7 @@
// to what it thinks is appropriate.
message ImageResource {
// An image resource that maps to an Android drawable by resource ID.
- AndroidImageResourceByResId android_resource_by_resid = 1;
+ AndroidImageResourceByResId android_resource_by_res_id = 1;
// An image resource that contains the image data inline.
InlineImageResource inline_resource = 2;
diff --git a/wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java b/wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java
index 5fb0cfb..90053ee 100644
--- a/wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java
+++ b/wear/tiles/tiles-renderer/src/androidTest/java/androidx/wear/tiles/renderer/test/TileRendererGoldenTest.java
@@ -170,14 +170,14 @@
.putIdToImage(
"android",
ImageResource.newBuilder()
- .setAndroidResourceByResid(
+ .setAndroidResourceByResId(
AndroidImageResourceByResId.newBuilder()
.setResourceId(R.drawable.android_24dp))
.build())
.putIdToImage(
"android_withbg_120dp",
ImageResource.newBuilder()
- .setAndroidResourceByResid(
+ .setAndroidResourceByResId(
AndroidImageResourceByResId.newBuilder()
.setResourceId(R.mipmap.android_withbg_120dp))
.build())
@@ -194,14 +194,14 @@
.putIdToImage(
"broken_image",
ImageResource.newBuilder()
- .setAndroidResourceByResid(
+ .setAndroidResourceByResId(
AndroidImageResourceByResId.newBuilder()
.setResourceId(R.drawable.broken_drawable))
.build())
.putIdToImage(
"missing_image",
ImageResource.newBuilder()
- .setAndroidResourceByResid(
+ .setAndroidResourceByResId(
AndroidImageResourceByResId.newBuilder().setResourceId(-1))
.build())
.build();
diff --git a/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/internal/ResourceResolvers.java b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/internal/ResourceResolvers.java
index 528c8fe..0d63cdd 100644
--- a/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/internal/ResourceResolvers.java
+++ b/wear/tiles/tiles-renderer/src/main/java/androidx/wear/tiles/renderer/internal/ResourceResolvers.java
@@ -113,10 +113,10 @@
"Resource " + protoResourceId + " is not defined in resources bundle"));
}
- if (imageResource.hasAndroidResourceByResid()
+ if (imageResource.hasAndroidResourceByResId()
&& mAndroidImageResourceByResIdResolver != null) {
AndroidImageResourceByResIdResolver resolver = mAndroidImageResourceByResIdResolver;
- return resolver.getDrawable(imageResource.getAndroidResourceByResid());
+ return resolver.getDrawable(imageResource.getAndroidResourceByResId());
}
if (imageResource.hasInlineResource() && mInlineImageResourceResolver != null) {
diff --git a/wear/tiles/tiles/api/current.txt b/wear/tiles/tiles/api/current.txt
index ee9c959..b8b6516 100644
--- a/wear/tiles/tiles/api/current.txt
+++ b/wear/tiles/tiles/api/current.txt
@@ -691,8 +691,8 @@
public static final class ResourceBuilders.ImageResource.Builder {
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource build();
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder);
}
diff --git a/wear/tiles/tiles/api/public_plus_experimental_current.txt b/wear/tiles/tiles/api/public_plus_experimental_current.txt
index 5a4d2b4..51becbb 100644
--- a/wear/tiles/tiles/api/public_plus_experimental_current.txt
+++ b/wear/tiles/tiles/api/public_plus_experimental_current.txt
@@ -696,8 +696,8 @@
public static final class ResourceBuilders.ImageResource.Builder {
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource build();
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder);
}
diff --git a/wear/tiles/tiles/api/restricted_current.txt b/wear/tiles/tiles/api/restricted_current.txt
index ee9c959..b8b6516 100644
--- a/wear/tiles/tiles/api/restricted_current.txt
+++ b/wear/tiles/tiles/api/restricted_current.txt
@@ -691,8 +691,8 @@
public static final class ResourceBuilders.ImageResource.Builder {
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource build();
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
- method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResid(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId);
+ method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setAndroidResourceByResId(androidx.wear.tiles.builders.ResourceBuilders.AndroidImageResourceByResId.Builder);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource);
method public androidx.wear.tiles.builders.ResourceBuilders.ImageResource.Builder setInlineResource(androidx.wear.tiles.builders.ResourceBuilders.InlineImageResource.Builder);
}
diff --git a/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java
index 16abf2d..fde80e0 100644
--- a/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java
+++ b/wear/tiles/tiles/src/main/java/androidx/wear/tiles/builders/ResourceBuilders.java
@@ -241,18 +241,18 @@
/** Sets an image resource that maps to an Android drawable by resource ID. */
@SuppressLint("MissingGetterMatchingBuilder")
@NonNull
- public Builder setAndroidResourceByResid(
- @NonNull AndroidImageResourceByResId androidResourceByResid) {
- mImpl.setAndroidResourceByResid(androidResourceByResid.toProto());
+ public Builder setAndroidResourceByResId(
+ @NonNull AndroidImageResourceByResId androidResourceByResId) {
+ mImpl.setAndroidResourceByResId(androidResourceByResId.toProto());
return this;
}
/** Sets an image resource that maps to an Android drawable by resource ID. */
@SuppressLint("MissingGetterMatchingBuilder")
@NonNull
- public Builder setAndroidResourceByResid(
- @NonNull AndroidImageResourceByResId.Builder androidResourceByResidBuilder) {
- mImpl.setAndroidResourceByResid(androidResourceByResidBuilder.build().toProto());
+ public Builder setAndroidResourceByResId(
+ @NonNull AndroidImageResourceByResId.Builder androidResourceByResIdBuilder) {
+ mImpl.setAndroidResourceByResId(androidResourceByResIdBuilder.build().toProto());
return this;
}