summaryrefslogtreecommitdiff
path: root/graphics/java/android
diff options
context:
space:
mode:
author Kohsuke Yatoh <kyatoh@google.com> 2021-02-16 18:32:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-16 18:32:58 +0000
commitd3279fa99c2ee61ea87dfbfc6050a1a3213a6f84 (patch)
treeb1b43347de0ae37fc51f1f268531ad730d476df2 /graphics/java/android
parentf6888b8de9328fc97f4d652c072e64bd3a7b993b (diff)
parentc2008e8aac0e58f4bd3f58d33d35d3d7eaa68b56 (diff)
Merge "Add FontManager#updateFontFamily() API." into sc-dev
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/fonts/FontVariationAxis.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java
index 7bd581723d18..d1fe2cdbcd77 100644
--- a/graphics/java/android/graphics/fonts/FontVariationAxis.java
+++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java
@@ -23,6 +23,7 @@ import android.os.Build;
import android.text.TextUtils;
import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
import java.util.regex.Pattern;
@@ -189,6 +190,17 @@ public final class FontVariationAxis {
return TextUtils.join(",", axes);
}
+ /**
+ * Stringify the array of FontVariationAxis.
+ * @hide
+ */
+ public static @NonNull String toFontVariationSettings(@Nullable List<FontVariationAxis> axes) {
+ if (axes == null) {
+ return "";
+ }
+ return TextUtils.join(",", axes);
+ }
+
@Override
public boolean equals(@Nullable Object o) {
if (o == this) {