Use util.Locale instead of new Locale class.
Test: ./gradlew ui:ui-text:test
Test: ./gradlew ui:ui text:connectedAndroidTest
Bug: 132172956
Change-Id: Ic47b5727124e856fc3ecd15e68615e7e034ecd72
diff --git a/ui/ui-text/api/1.0.0-alpha01.txt b/ui/ui-text/api/1.0.0-alpha01.txt
index 7d15e2a..86efcbe 100644
--- a/ui/ui-text/api/1.0.0-alpha01.txt
+++ b/ui/ui-text/api/1.0.0-alpha01.txt
@@ -63,25 +63,6 @@
method public T! getStyle();
}
- public final class Locale {
- ctor public Locale(String _languageCode, String? _countryCode);
- method public String component1();
- method public String? component2();
- method public androidx.ui.text.Locale copy(String _languageCode, String? _countryCode);
- method public String! getCountryCode();
- method public String getLanguageCode();
- method public String? get_countryCode();
- method public String get_languageCode();
- property public final String! countryCode;
- property public final String languageCode;
- field public static final androidx.ui.text.Locale.Companion! Companion;
- }
-
- public static final class Locale.Companion {
- method public String _canonicalizeLanguageCode(String languageCode);
- method public String _canonicalizeRegionCode(String regionCode);
- }
-
public final class MultiParagraphKt {
ctor public MultiParagraphKt();
}
@@ -149,12 +130,12 @@
}
public final class TextStyle {
- ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
ctor public TextStyle();
method public androidx.ui.graphics.Color? component1();
method public androidx.ui.text.style.BaselineShift? component10();
method public androidx.ui.text.style.TextGeometricTransform? component11();
- method public androidx.ui.text.Locale? component12();
+ method public java.util.Locale? component12();
method public androidx.ui.graphics.Color? component13();
method public androidx.ui.text.style.TextDecoration? component14();
method public androidx.ui.painting.Shadow? component15();
@@ -166,7 +147,7 @@
method public androidx.ui.text.font.FontFamily? component7();
method public String? component8();
method public Float? component9();
- method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
method public androidx.ui.graphics.Color? getBackground();
method public androidx.ui.text.style.BaselineShift? getBaselineShift();
method public androidx.ui.graphics.Color? getColor();
@@ -179,7 +160,7 @@
method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.ui.text.font.FontWeight? getFontWeight();
method public Float? getLetterSpacing();
- method public androidx.ui.text.Locale? getLocale();
+ method public java.util.Locale? getLocale();
method public androidx.ui.painting.Shadow? getShadow();
method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
diff --git a/ui/ui-text/api/api_lint.ignore b/ui/ui-text/api/api_lint.ignore
index 87e9863..8d78f05 100644
--- a/ui/ui-text/api/api_lint.ignore
+++ b/ui/ui-text/api/api_lint.ignore
@@ -9,21 +9,17 @@
Must avoid boxed primitives (`java.lang.Float`)
AutoBoxing: androidx.ui.text.ParagraphStyle#getLineHeight():
Must avoid boxed primitives (`java.lang.Float`)
-AutoBoxing: androidx.ui.text.TextDelegate#TextPainter(androidx.ui.text.AnnotatedString, androidx.ui.text.TextStyle, androidx.ui.text.ParagraphStyle, Integer, boolean, androidx.ui.text.style.TextOverflow, androidx.ui.text.Locale, androidx.ui.core.Density, androidx.ui.text.font.Font.ResourceLoader) parameter #3:
- Must avoid boxed primitives (`java.lang.Integer`)
-AutoBoxing: androidx.ui.text.TextDelegate#getMaxLines():
- Must avoid boxed primitives (`java.lang.Integer`)
-AutoBoxing: androidx.ui.text.TextStyle#TextStyle(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, androidx.ui.text.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #2:
+AutoBoxing: androidx.ui.text.TextStyle#TextStyle(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, java.util.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #2:
Must avoid boxed primitives (`java.lang.Float`)
-AutoBoxing: androidx.ui.text.TextStyle#TextStyle(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, androidx.ui.text.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #8:
+AutoBoxing: androidx.ui.text.TextStyle#TextStyle(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, java.util.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #8:
Must avoid boxed primitives (`java.lang.Float`)
AutoBoxing: androidx.ui.text.TextStyle#component3():
Must avoid boxed primitives (`java.lang.Float`)
AutoBoxing: androidx.ui.text.TextStyle#component9():
Must avoid boxed primitives (`java.lang.Float`)
-AutoBoxing: androidx.ui.text.TextStyle#copy(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, androidx.ui.text.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #2:
+AutoBoxing: androidx.ui.text.TextStyle#copy(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, java.util.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #2:
Must avoid boxed primitives (`java.lang.Float`)
-AutoBoxing: androidx.ui.text.TextStyle#copy(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, androidx.ui.text.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #8:
+AutoBoxing: androidx.ui.text.TextStyle#copy(androidx.ui.graphics.Color, androidx.ui.core.Sp, Float, androidx.ui.text.font.FontWeight, androidx.ui.text.font.FontStyle, androidx.ui.text.font.FontSynthesis, androidx.ui.text.font.FontFamily, String, Float, androidx.ui.text.style.BaselineShift, androidx.ui.text.style.TextGeometricTransform, java.util.Locale, androidx.ui.graphics.Color, androidx.ui.text.style.TextDecoration, androidx.ui.painting.Shadow) parameter #8:
Must avoid boxed primitives (`java.lang.Float`)
AutoBoxing: androidx.ui.text.TextStyle#getFontSizeScale():
Must avoid boxed primitives (`java.lang.Float`)
@@ -55,10 +51,6 @@
Note that adding the `operator` keyword would allow calling this method using operator syntax
-MissingNullability: androidx.ui.text.Locale#Companion:
- Missing nullability on field `Companion` in class `class androidx.ui.text.Locale`
-MissingNullability: androidx.ui.text.Locale#getCountryCode():
- Missing nullability on method `getCountryCode` return
MissingNullability: androidx.ui.text.font.FontWeight#Companion:
Missing nullability on field `Companion` in class `class androidx.ui.text.font.FontWeight`
MissingNullability: androidx.ui.text.style.BaselineShift#Companion:
diff --git a/ui/ui-text/api/current.txt b/ui/ui-text/api/current.txt
index 7d15e2a..86efcbe 100644
--- a/ui/ui-text/api/current.txt
+++ b/ui/ui-text/api/current.txt
@@ -63,25 +63,6 @@
method public T! getStyle();
}
- public final class Locale {
- ctor public Locale(String _languageCode, String? _countryCode);
- method public String component1();
- method public String? component2();
- method public androidx.ui.text.Locale copy(String _languageCode, String? _countryCode);
- method public String! getCountryCode();
- method public String getLanguageCode();
- method public String? get_countryCode();
- method public String get_languageCode();
- property public final String! countryCode;
- property public final String languageCode;
- field public static final androidx.ui.text.Locale.Companion! Companion;
- }
-
- public static final class Locale.Companion {
- method public String _canonicalizeLanguageCode(String languageCode);
- method public String _canonicalizeRegionCode(String regionCode);
- }
-
public final class MultiParagraphKt {
ctor public MultiParagraphKt();
}
@@ -149,12 +130,12 @@
}
public final class TextStyle {
- ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
ctor public TextStyle();
method public androidx.ui.graphics.Color? component1();
method public androidx.ui.text.style.BaselineShift? component10();
method public androidx.ui.text.style.TextGeometricTransform? component11();
- method public androidx.ui.text.Locale? component12();
+ method public java.util.Locale? component12();
method public androidx.ui.graphics.Color? component13();
method public androidx.ui.text.style.TextDecoration? component14();
method public androidx.ui.painting.Shadow? component15();
@@ -166,7 +147,7 @@
method public androidx.ui.text.font.FontFamily? component7();
method public String? component8();
method public Float? component9();
- method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
method public androidx.ui.graphics.Color? getBackground();
method public androidx.ui.text.style.BaselineShift? getBaselineShift();
method public androidx.ui.graphics.Color? getColor();
@@ -179,7 +160,7 @@
method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.ui.text.font.FontWeight? getFontWeight();
method public Float? getLetterSpacing();
- method public androidx.ui.text.Locale? getLocale();
+ method public java.util.Locale? getLocale();
method public androidx.ui.painting.Shadow? getShadow();
method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
diff --git a/ui/ui-text/api/restricted_1.0.0-alpha01.txt b/ui/ui-text/api/restricted_1.0.0-alpha01.txt
index a2896e5..1c5ab69 100644
--- a/ui/ui-text/api/restricted_1.0.0-alpha01.txt
+++ b/ui/ui-text/api/restricted_1.0.0-alpha01.txt
@@ -77,25 +77,6 @@
method public T! getStyle();
}
- public final class Locale {
- ctor public Locale(String _languageCode, String? _countryCode);
- method public String component1();
- method public String? component2();
- method public androidx.ui.text.Locale copy(String _languageCode, String? _countryCode);
- method public String! getCountryCode();
- method public String getLanguageCode();
- method public String? get_countryCode();
- method public String get_languageCode();
- property public final String! countryCode;
- property public final String languageCode;
- field public static final androidx.ui.text.Locale.Companion! Companion;
- }
-
- public static final class Locale.Companion {
- method public String _canonicalizeLanguageCode(String languageCode);
- method public String _canonicalizeRegionCode(String regionCode);
- }
-
public final class MultiParagraphKt {
ctor public MultiParagraphKt();
}
@@ -175,12 +156,12 @@
}
public final class TextStyle {
- ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
ctor public TextStyle();
method public androidx.ui.graphics.Color? component1();
method public androidx.ui.text.style.BaselineShift? component10();
method public androidx.ui.text.style.TextGeometricTransform? component11();
- method public androidx.ui.text.Locale? component12();
+ method public java.util.Locale? component12();
method public androidx.ui.graphics.Color? component13();
method public androidx.ui.text.style.TextDecoration? component14();
method public androidx.ui.painting.Shadow? component15();
@@ -192,7 +173,7 @@
method public androidx.ui.text.font.FontFamily? component7();
method public String? component8();
method public Float? component9();
- method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
method public androidx.ui.graphics.Color? getBackground();
method public androidx.ui.text.style.BaselineShift? getBaselineShift();
method public androidx.ui.graphics.Color? getColor();
@@ -205,7 +186,7 @@
method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.ui.text.font.FontWeight? getFontWeight();
method public Float? getLetterSpacing();
- method public androidx.ui.text.Locale? getLocale();
+ method public java.util.Locale? getLocale();
method public androidx.ui.painting.Shadow? getShadow();
method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
diff --git a/ui/ui-text/api/restricted_current.txt b/ui/ui-text/api/restricted_current.txt
index a2896e5..1c5ab69 100644
--- a/ui/ui-text/api/restricted_current.txt
+++ b/ui/ui-text/api/restricted_current.txt
@@ -77,25 +77,6 @@
method public T! getStyle();
}
- public final class Locale {
- ctor public Locale(String _languageCode, String? _countryCode);
- method public String component1();
- method public String? component2();
- method public androidx.ui.text.Locale copy(String _languageCode, String? _countryCode);
- method public String! getCountryCode();
- method public String getLanguageCode();
- method public String? get_countryCode();
- method public String get_languageCode();
- property public final String! countryCode;
- property public final String languageCode;
- field public static final androidx.ui.text.Locale.Companion! Companion;
- }
-
- public static final class Locale.Companion {
- method public String _canonicalizeLanguageCode(String languageCode);
- method public String _canonicalizeRegionCode(String regionCode);
- }
-
public final class MultiParagraphKt {
ctor public MultiParagraphKt();
}
@@ -175,12 +156,12 @@
}
public final class TextStyle {
- ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ ctor public TextStyle(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
ctor public TextStyle();
method public androidx.ui.graphics.Color? component1();
method public androidx.ui.text.style.BaselineShift? component10();
method public androidx.ui.text.style.TextGeometricTransform? component11();
- method public androidx.ui.text.Locale? component12();
+ method public java.util.Locale? component12();
method public androidx.ui.graphics.Color? component13();
method public androidx.ui.text.style.TextDecoration? component14();
method public androidx.ui.painting.Shadow? component15();
@@ -192,7 +173,7 @@
method public androidx.ui.text.font.FontFamily? component7();
method public String? component8();
method public Float? component9();
- method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.text.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
+ method public androidx.ui.text.TextStyle copy(androidx.ui.graphics.Color? color, androidx.ui.core.Sp? fontSize, Float? fontSizeScale, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, Float? letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, java.util.Locale? locale, androidx.ui.graphics.Color? background, androidx.ui.text.style.TextDecoration? decoration, androidx.ui.painting.Shadow? shadow);
method public androidx.ui.graphics.Color? getBackground();
method public androidx.ui.text.style.BaselineShift? getBaselineShift();
method public androidx.ui.graphics.Color? getColor();
@@ -205,7 +186,7 @@
method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
method public androidx.ui.text.font.FontWeight? getFontWeight();
method public Float? getLetterSpacing();
- method public androidx.ui.text.Locale? getLocale();
+ method public java.util.Locale? getLocale();
method public androidx.ui.painting.Shadow? getShadow();
method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
diff --git a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/CraneText.kt b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/CraneText.kt
index a4f8e25..e9af896 100644
--- a/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/CraneText.kt
+++ b/ui/ui-text/integration-tests/text-demos/src/main/java/androidx/ui/text/demos/CraneText.kt
@@ -33,7 +33,6 @@
import androidx.ui.text.style.TextDecoration
import androidx.ui.text.style.TextDirection
import androidx.ui.text.font.FontFamily
-import androidx.ui.text.Locale
import androidx.ui.graphics.Color
import androidx.ui.graphics.lerp
import androidx.ui.layout.Column
@@ -49,6 +48,7 @@
import androidx.ui.core.sp
import androidx.ui.text.AnnotatedString
import androidx.ui.text.style.TextIndent
+import java.util.Locale
val displayText = "Text Demo"
val displayTextChinese = "文本演示"
@@ -377,7 +377,7 @@
text = "$text ",
style = TextStyle(
fontSize = fontSize8,
- locale = Locale(_languageCode = "ja", _countryCode = "JP")
+ locale = Locale("ja", "JP")
)
)
@@ -385,7 +385,7 @@
text = "$text ",
style = TextStyle(
fontSize = fontSize8,
- locale = Locale(_languageCode = "zh", _countryCode = "CN")
+ locale = Locale("zh", "CN")
)
)
@@ -393,7 +393,7 @@
text = text,
style = TextStyle(
fontSize = fontSize8,
- locale = Locale(_languageCode = "zh", _countryCode = "TW")
+ locale = Locale("zh", "TW")
)
)
}
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
index 75c21b6..96f43d1 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/MultiParagraphIntegrationTest.kt
@@ -40,6 +40,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import java.util.Locale
@RunWith(JUnit4::class)
@SmallTest
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
index 9718437..0487f3c 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/ParagraphIntegrationTest.kt
@@ -48,6 +48,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import java.util.Locale
@RunWith(JUnit4::class)
@SmallTest
@@ -1000,10 +1001,10 @@
val fontSizeInPx = fontSize.toPx().value
val locales = arrayOf(
// duplicate ja is on purpose
- Locale(_languageCode = "ja"),
- Locale(_languageCode = "ja"),
- Locale(_languageCode = "zh", _countryCode = "CN"),
- Locale(_languageCode = "zh", _countryCode = "TW")
+ Locale("ja"),
+ Locale("ja"),
+ Locale("zh", "CN"),
+ Locale("zh", "TW")
)
val bitmaps = locales.map { locale ->
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
index ef5b100..3be82b7 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
@@ -37,7 +37,6 @@
import androidx.ui.text.style.TextIndent
import androidx.ui.text.font.FontFamily
import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.Locale
import androidx.ui.graphics.Color
import androidx.ui.text.matchers.equalToBitmap
import androidx.ui.text.matchers.hasSpan
@@ -63,6 +62,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import java.util.Locale
import kotlin.math.ceil
@RunWith(JUnit4::class)
@@ -1216,7 +1216,7 @@
@Test
fun locale_isSetOnParagraphImpl_enUS() {
- val locale = Locale(_languageCode = "en", _countryCode = "US")
+ val locale = Locale("en", "US")
val text = "abc"
val paragraph = simpleParagraph(
text = text,
@@ -1230,7 +1230,7 @@
@Test
fun locale_isSetOnParagraphImpl_jpJP() {
- val locale = Locale(_languageCode = "ja", _countryCode = "JP")
+ val locale = Locale("ja", "JP")
val text = "abc"
val paragraph = simpleParagraph(
text = text,
@@ -1244,7 +1244,7 @@
@Test
fun locale_noCountryCode_isSetOnParagraphImpl() {
- val locale = Locale(_languageCode = "ja")
+ val locale = Locale("ja")
val text = "abc"
val paragraph = simpleParagraph(
text = text,
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/Locale.kt b/ui/ui-text/src/main/java/androidx/ui/text/Locale.kt
deleted file mode 100644
index 2c75c98..0000000
--- a/ui/ui-text/src/main/java/androidx/ui/text/Locale.kt
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.ui.text
-
-/**
- * An identifier used to select a user's language and formatting preferences,
- * consisting of a language and a country. This is a subset of locale
- * identifiers as defined by BCP 47.
- *
- * Locales are canonicalized according to the "preferred value" entries in the
- * [IANA Language Subtag
- * Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
- * For example, `const Locale('he')` and `const Locale('iw')` are equal and
- * both have the [languageCode] `he`, because `iw` is a deprecated language
- * subtag that was replaced by the subtag `he`.
- *
- * The default constructor creates a new Locale object. The first argument is the
- * primary language subtag, the second is the region subtag.
- *
- * For example:
- *
- * val swissFrench = Locale('fr', 'CH');
- * val canadianFrench = Locale('fr', 'CA');
- *
- *
- * The primary language subtag must not be null. The region subtag is
- * optional.
- *
- * The values are _case sensitive_, and should match the case of the relevant
- * subtags in the [IANA Language Subtag Registry]
- * (https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
- * Typically this means the primary language subtag should be lowercase and
- * the region subtag should be uppercase.
- */
-data class Locale(
- val _languageCode: String,
- val _countryCode: String? = null
-) {
-
- // TODO(Migration/siyamed): this class is far far far too much very limited.
- // we might want to wrap system locale, or use system locale.
- // The package is also not good, Locale should be somewhere else not under window.
- // nona@ we need at least
- // * ISO 15924 script tag. This is required for sr-Latn/sr-Cyrl support.
- // * Variant. This is required for hyphenation for German, de-1996/de-1901
- // * Unicode extensions: This is required Arabic/Latin digits selection.
- // Also, this needs to be a list of locale, otherwise
- // * locale list based font fallback doesn't work.
- // * resource fallback may not work well.
-
- /**
- * The primary language subtag for the locale.
- *
- * This must not be null.
- *
- * This is expected to be string registered in the [IANA Language Subtag
- * Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
- * with the type "language". The string specified must match the case of the
- * string in the registry.
- *
- * Language subtags that are deprecated in the registry and have a preferred
- * code are changed to their preferred code. For example, `const
- * Locale('he')` and `const Locale('iw')` are equal, and both have the
- * [languageCode] `he`, because `iw` is a deprecated language subtag that was
- * replaced by the subtag `he`.
- */
- val languageCode: String
- get() = _canonicalizeLanguageCode(_languageCode)
-
- /**
- * The region subtag for the locale.
- *
- * This can be null.
- *
- * This is expected to be string registered in the [IANA Language Subtag
- * Registry](https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
- * with the type "region". The string specified must match the case of the
- * string in the registry.
- *
- * Region subtags that are deprecated in the registry and have a preferred
- * code are changed to their preferred code. For example, `const Locale('de',
- * 'DE')` and `const Locale('de', 'DD')` are equal, and both have the
- * [countryCode] `DE`, because `DD` is a deprecated language subtag that was
- * replaced by the subtag `DE`.
- */
- val countryCode
- get() = if (_countryCode != null) _canonicalizeRegionCode(
- _countryCode
- ) else null
-
- companion object {
- fun _canonicalizeLanguageCode(languageCode: String): String {
- // This switch statement is generated by //flutter/tools/gen_locale.dart
- // TODO(popam): look into that tool
- // Mappings generated for language subtag registry as of 2017-08-15.
- return when (languageCode) {
- "in" -> "id"; // Indonesian; deprecated 1989-01-01
- "iw" -> "he"; // Hebrew; deprecated 1989-01-01
- "ji" -> "yi"; // Yiddish; deprecated 1989-01-01
- "jw" -> "jv"; // Javanese; deprecated 2001-08-13
- "mo" -> "ro"; // Moldavian, Moldovan; deprecated 2008-11-22
- "aam" -> "aas"; // Aramanik; deprecated 2015-02-12
- "adp" -> "dz"; // Adap; deprecated 2015-02-12
- "aue" -> "ktz"; // =/Kx"au//"ein; deprecated 2015-02-12
- "ayx" -> "nun"; // Ayi (China); deprecated 2011-08-16
- "bgm" -> "bcg"; // Baga Mboteni; deprecated 2016-05-30
- "bjd" -> "drl"; // Bandjigali; deprecated 2012-08-12
- "ccq" -> "rki"; // Chaungtha; deprecated 2012-08-12
- "cjr" -> "mom"; // Chorotega; deprecated 2010-03-11
- "cka" -> "cmr"; // Khumi Awa Chin; deprecated 2012-08-12
- "cmk" -> "xch"; // Chimakum; deprecated 2010-03-11
- "coy" -> "pij"; // Coyaima; deprecated 2016-05-30
- "cqu" -> "quh"; // Chilean Quechua; deprecated 2016-05-30
- "drh" -> "khk"; // Darkhat; deprecated 2010-03-11
- "drw" -> "prs"; // Darwazi; deprecated 2010-03-11
- "gav" -> "dev"; // Gabutamon; deprecated 2010-03-11
- "gfx" -> "vaj"; // Mangetti Dune !Xung; deprecated 2015-02-12
- "ggn" -> "gvr"; // Eastern Gurung; deprecated 2016-05-30
- "gti" -> "nyc"; // Gbati-ri; deprecated 2015-02-12
- "guv" -> "duz"; // Gey; deprecated 2016-05-30
- "hrr" -> "jal"; // Horuru; deprecated 2012-08-12
- "ibi" -> "opa"; // Ibilo; deprecated 2012-08-12
- "ilw" -> "gal"; // Talur; deprecated 2013-09-10
- "jeg" -> "oyb"; // Jeng; deprecated 2017-02-23
- "kgc" -> "tdf"; // Kasseng; deprecated 2016-05-30
- "kgh" -> "kml"; // Upper Tanudan Kalinga; deprecated 2012-08-12
- "koj" -> "kwv"; // Sara Dunjo; deprecated 2015-02-12
- "krm" -> "bmf"; // Krim; deprecated 2017-02-23
- "ktr" -> "dtp"; // Kota Marudu Tinagas; deprecated 2016-05-30
- "kvs" -> "gdj"; // Kunggara; deprecated 2016-05-30
- "kwq" -> "yam"; // Kwak; deprecated 2015-02-12
- "kxe" -> "tvd"; // Kakihum; deprecated 2015-02-12
- "kzj" -> "dtp"; // Coastal Kadazan; deprecated 2016-05-30
- "kzt" -> "dtp"; // Tambunan Dusun; deprecated 2016-05-30
- "lii" -> "raq"; // Lingkhim; deprecated 2015-02-12
- "lmm" -> "rmx"; // Lamam; deprecated 2014-02-28
- "meg" -> "cir"; // Mea; deprecated 2013-09-10
- "mst" -> "mry"; // Cataelano Mandaya; deprecated 2010-03-11
- "mwj" -> "vaj"; // Maligo; deprecated 2015-02-12
- "myt" -> "mry"; // Sangab Mandaya; deprecated 2010-03-11
- "nad" -> "xny"; // Nijadali; deprecated 2016-05-30
- "nnx" -> "ngv"; // Ngong; deprecated 2015-02-12
- "nts" -> "pij"; // Natagaimas; deprecated 2016-05-30
- "oun" -> "vaj"; // !O!ung; deprecated 2015-02-12
- "pcr" -> "adx"; // Panang; deprecated 2013-09-10
- "pmc" -> "huw"; // Palumata; deprecated 2016-05-30
- "pmu" -> "phr"; // Mirpur Panjabi; deprecated 2015-02-12
- "ppa" -> "bfy"; // Pao; deprecated 2016-05-30
- "ppr" -> "lcq"; // Piru; deprecated 2013-09-10
- "pry" -> "prt"; // Pray 3; deprecated 2016-05-30
- "puz" -> "pub"; // Purum Naga; deprecated 2014-02-28
- "sca" -> "hle"; // Sansu; deprecated 2012-08-12
- "skk" -> "oyb"; // Sok; deprecated 2017-02-23
- "tdu" -> "dtp"; // Tempasuk Dusun; deprecated 2016-05-30
- "thc" -> "tpo"; // Tai Hang Tong; deprecated 2016-05-30
- "thx" -> "oyb"; // The; deprecated 2015-02-12
- "tie" -> "ras"; // Tingal; deprecated 2011-08-16
- "tkk" -> "twm"; // Takpa; deprecated 2011-08-16
- "tlw" -> "weo"; // South Wemale; deprecated 2012-08-12
- "tmp" -> "tyj"; // Tai Mène; deprecated 2016-05-30
- "tne" -> "kak"; // Tinoc Kallahan; deprecated 2016-05-30
- "tnf" -> "prs"; // Tangshewi; deprecated 2010-03-11
- "tsf" -> "taj"; // Southwestern Tamang; deprecated 2015-02-12
- "uok" -> "ema"; // Uokha; deprecated 2015-02-12
- "xba" -> "cax"; // Kamba (Brazil); deprecated 2016-05-30
- "xia" -> "acn"; // Xiandao; deprecated 2013-09-10
- "xkh" -> "waw"; // Karahawyana; deprecated 2016-05-30
- "xsj" -> "suj"; // Subi; deprecated 2015-02-12
- "ybd" -> "rki"; // Yangbye; deprecated 2012-08-12
- "yma" -> "lrr"; // Yamphe; deprecated 2012-08-12
- "ymt" -> "mtm"; // Mator-Taygi-Karagas; deprecated 2015-02-12
- "yos" -> "zom"; // Yos; deprecated 2013-09-10
- "yuu" -> "yug"; // Yugh; deprecated 2014-02-28
- else -> languageCode
- }
- }
-
- fun _canonicalizeRegionCode(regionCode: String): String {
- // This switch statement is generated by //flutter/tools/gen_locale.dart
- // TODO(popam): look into that tool
- // Mappings generated for language subtag registry as of 2017-08-15.
- return when (regionCode) {
- "BU" -> "MM"; // Burma; deprecated 1989-12-05
- "DD" -> "DE"; // German Democratic Republic; deprecated 1990-10-30
- "FX" -> "FR"; // Metropolitan France; deprecated 1997-07-14
- "TP" -> "TL"; // East Timor; deprecated 2002-05-20
- "YD" -> "YE"; // Democratic Yemen; deprecated 1990-08-14
- "ZR" -> "CD"; // Zaire; deprecated 1997-07-14
- else -> regionCode
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt b/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
index 0b50c2b..20828cc 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/TextDelegate.kt
@@ -41,6 +41,7 @@
import androidx.ui.painting.Shader
import androidx.ui.text.font.Font
import androidx.ui.text.style.TextOverflow
+import java.util.Locale
import kotlin.math.ceil
private val DefaultTextAlign: TextAlign = TextAlign.Start
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/TextStyle.kt b/ui/ui-text/src/main/java/androidx/ui/text/TextStyle.kt
index b500187..f8be302 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/TextStyle.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/TextStyle.kt
@@ -30,6 +30,7 @@
import androidx.ui.graphics.lerp
import androidx.ui.lerp
import androidx.ui.painting.Shadow
+import java.util.Locale
/**
* Configuration object to define the text style.
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
index ce4624b0..d82e343 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
@@ -437,7 +437,7 @@
style.locale?.let {
spannableString.setSpan(
// TODO(Migration/haoyuchang): support locale fallback in the framework
- LocaleSpan(Locale(it.languageCode, it.countryCode ?: "")),
+ LocaleSpan(Locale(it.language, it.country ?: "")),
start,
end,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -497,8 +497,8 @@
locale?.let {
textPaint.textLocale = Locale(
- it.languageCode,
- it.countryCode ?: ""
+ it.language,
+ it.country ?: ""
)
}
diff --git a/ui/ui-text/src/test/java/androidx/ui/text/TextDelegateTest.kt b/ui/ui-text/src/test/java/androidx/ui/text/TextDelegateTest.kt
index 3b34061..6487e90 100644
--- a/ui/ui-text/src/test/java/androidx/ui/text/TextDelegateTest.kt
+++ b/ui/ui-text/src/test/java/androidx/ui/text/TextDelegateTest.kt
@@ -28,6 +28,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import java.util.Locale
@RunWith(JUnit4::class)
class TextDelegateTest() {
diff --git a/ui/ui-text/src/test/java/androidx/ui/text/TextStyleTest.kt b/ui/ui-text/src/test/java/androidx/ui/text/TextStyleTest.kt
index 70ae35a..42c143e 100644
--- a/ui/ui-text/src/test/java/androidx/ui/text/TextStyleTest.kt
+++ b/ui/ui-text/src/test/java/androidx/ui/text/TextStyleTest.kt
@@ -34,6 +34,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+import java.util.Locale
@RunWith(JUnit4::class)
class TextStyleTest {
