Remove Colors from the public API
Bug: 223406280
Test: N/A
Relnote: "Colors have been removed from the Tiles Material API."
Change-Id: I0ab55d028f8828e8a61e4f8eb8d764a7f78ed1bd
diff --git a/wear/tiles/tiles-material/api/current.txt b/wear/tiles/tiles-material/api/current.txt
index 78b55a8..a8ed27f 100644
--- a/wear/tiles/tiles-material/api/current.txt
+++ b/wear/tiles/tiles-material/api/current.txt
@@ -116,13 +116,6 @@
method public androidx.wear.tiles.material.CircularProgressIndicator.Builder setStrokeWidth(@Dimension(unit=androidx.annotation.Dimension.DP) float);
}
- public class Colors {
- field @ColorInt public static final int ON_PRIMARY = -14671580; // 0xff202124
- field @ColorInt public static final int ON_SURFACE = -1; // 0xffffffff
- field @ColorInt public static final int PRIMARY = -5321734; // 0xffaecbfa
- field @ColorInt public static final int SURFACE = -14671580; // 0xff202124
- }
-
public class CompactChip implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
diff --git a/wear/tiles/tiles-material/api/public_plus_experimental_current.txt b/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
index 78b55a8..a8ed27f 100644
--- a/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
+++ b/wear/tiles/tiles-material/api/public_plus_experimental_current.txt
@@ -116,13 +116,6 @@
method public androidx.wear.tiles.material.CircularProgressIndicator.Builder setStrokeWidth(@Dimension(unit=androidx.annotation.Dimension.DP) float);
}
- public class Colors {
- field @ColorInt public static final int ON_PRIMARY = -14671580; // 0xff202124
- field @ColorInt public static final int ON_SURFACE = -1; // 0xffffffff
- field @ColorInt public static final int PRIMARY = -5321734; // 0xffaecbfa
- field @ColorInt public static final int SURFACE = -14671580; // 0xff202124
- }
-
public class CompactChip implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
diff --git a/wear/tiles/tiles-material/api/restricted_current.txt b/wear/tiles/tiles-material/api/restricted_current.txt
index 78b55a8..a8ed27f 100644
--- a/wear/tiles/tiles-material/api/restricted_current.txt
+++ b/wear/tiles/tiles-material/api/restricted_current.txt
@@ -116,13 +116,6 @@
method public androidx.wear.tiles.material.CircularProgressIndicator.Builder setStrokeWidth(@Dimension(unit=androidx.annotation.Dimension.DP) float);
}
- public class Colors {
- field @ColorInt public static final int ON_PRIMARY = -14671580; // 0xff202124
- field @ColorInt public static final int ON_SURFACE = -1; // 0xffffffff
- field @ColorInt public static final int PRIMARY = -5321734; // 0xffaecbfa
- field @ColorInt public static final int SURFACE = -14671580; // 0xff202124
- }
-
public class CompactChip implements androidx.wear.tiles.LayoutElementBuilders.LayoutElement {
method public androidx.wear.tiles.material.ChipColors getChipColors();
method public androidx.wear.tiles.ModifiersBuilders.Clickable getClickable();
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
index a0123a3..487fbc8 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Button.java
@@ -61,8 +61,7 @@
*
* <p>The recommended set of {@link ButtonColors} styles can be obtained from {@link
* ButtonDefaults}., e.g. {@link ButtonDefaults#PRIMARY_BUTTON_COLORS} to get a color scheme for a
- * primary {@link Button} which by default will have a solid background of {@link Colors#PRIMARY}
- * and content color of {@link Colors#ON_PRIMARY}.
+ * primary {@link Button}.
*/
public class Button implements LayoutElement {
@NonNull private final Box mElement;
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
index 8465140..d40dd28 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Chip.java
@@ -73,9 +73,7 @@
* ChipDefaults#DEFAULT_MARGIN_PERCENT} which is set by default.
*
* <p>The recommended set of {@link ChipColors} styles can be obtained from {@link ChipDefaults}.,
- * e.g. {@link ChipDefaults#PRIMARY} to get a color scheme for a primary {@link Chip} which by
- * default will have a solid background of {@link Colors#PRIMARY} and content color of {@link
- * Colors#ON_PRIMARY}.
+ * e.g. {@link ChipDefaults#PRIMARY} to get a color scheme for a primary {@link Chip}.
*/
public class Chip implements LayoutElement {
@NonNull private final Box mElement;
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
index 8455984..09f6dc5 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CircularProgressIndicator.java
@@ -55,9 +55,8 @@
* length.
*
* <p>The recommended set of {@link ProgressIndicatorColors} can be obtained from {@link
- * ProgressIndicatorDefaults}., e.g. {@link ProgressIndicatorDefaults#DEFAULT_COLOR} to get a color
- * scheme for a {@link CircularProgressIndicator} which by default will have background arc of
- * {@link Colors#ON_SURFACE} and main progress arc color of {@link Colors#PRIMARY}.
+ * ProgressIndicatorDefaults}, e.g. {@link ProgressIndicatorDefaults#DEFAULT_COLOR} to get a default
+ * color scheme for a {@link CircularProgressIndicator}.
*/
public class CircularProgressIndicator implements LayoutElement {
@NonNull private final Arc mElement;
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Colors.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Colors.java
index fb2f7d4..b3e5301 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Colors.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Colors.java
@@ -17,8 +17,15 @@
package androidx.wear.tiles.material;
import androidx.annotation.ColorInt;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
-/** Contains the default color values used by all Tiles Components. */
+/**
+ * Contains the default color values used by all Tiles Components.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
public class Colors {
private Colors() {}
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CompactChip.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CompactChip.java
index 352e4bd..1bd666e 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CompactChip.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/CompactChip.java
@@ -41,9 +41,8 @@
* size.
*
* <p>The recommended set of {@link ChipColors} styles can be obtained from {@link ChipDefaults}.,
- * e.g. {@link ChipDefaults#COMPACT_PRIMARY} to get a color scheme for a primary {@link CompactChip}
- * which by default will have a solid background of {@link Colors#PRIMARY} and text color of {@link
- * Colors#ON_PRIMARY}.
+ * e.g. {@link ChipDefaults#COMPACT_PRIMARY} to get a color scheme for a primary
+ * {@link CompactChip}.
*/
public class CompactChip implements LayoutElement {
@NonNull private final Chip mElement;
@@ -84,7 +83,7 @@
/**
* Sets the colors for the {@link CompactChip}. If set, {@link
* ChipColors#getBackgroundColor()} will be used for the background of the button and {@link
- * ChipColors#getBackgroundColor()} for the text. If not set, {@link
+ * ChipColors#getContentColor()} for the text. If not set, {@link
* ChipDefaults#COMPACT_PRIMARY} will be used.
*/
@NonNull
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
index e4715db..89fc096 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/Text.java
@@ -103,9 +103,7 @@
return this;
}
- /**
- * Sets the color for the {@link Text}. If not set, {@link Colors#ON_PRIMARY} will be used.
- */
+ /** Sets the color for the {@link Text}. */
@NonNull
public Builder setColor(@NonNull ColorProp color) {
this.mColor = color;
diff --git a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/TitleChip.java b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/TitleChip.java
index dc8e18d..830ebd6 100644
--- a/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/TitleChip.java
+++ b/wear/tiles/tiles-material/src/main/java/androidx/wear/tiles/material/TitleChip.java
@@ -45,9 +45,7 @@
* take one line of text of {@link Typography#TYPOGRAPHY_TITLE2} style.
*
* <p>The recommended set of {@link ChipColors} styles can be obtained from {@link ChipDefaults},
- * e.g. {@link ChipDefaults#TITLE_PRIMARY} to get a color scheme for a primary {@link TitleChip}
- * which by default will have a solid background of {@link Colors#PRIMARY} and text color of {@link
- * Colors#ON_PRIMARY}.
+ * e.g. {@link ChipDefaults#TITLE_PRIMARY} to get a color scheme for a primary {@link TitleChip}.
*/
public class TitleChip implements LayoutElement {
@NonNull private final Chip mElement;
