Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 75e90cf..bc9a822 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -535,41 +535,6 @@
assertEquals(Align.RIGHT, p.getTextAlign());
}
- public void testAccessTextLocale() {
- Paint p = new Paint();
-
- final Locale defaultLocale = Locale.getDefault();
-
- // Check default
- assertEquals(defaultLocale, p.getTextLocale());
-
- // Check setter / getter
- p.setTextLocale(Locale.US);
- assertEquals(Locale.US, p.getTextLocale());
-
- p.setTextLocale(Locale.CHINESE);
- assertEquals(Locale.CHINESE, p.getTextLocale());
-
- p.setTextLocale(Locale.JAPANESE);
- assertEquals(Locale.JAPANESE, p.getTextLocale());
-
- p.setTextLocale(Locale.KOREAN);
- assertEquals(Locale.KOREAN, p.getTextLocale());
-
- // Check reverting back to default
- p.setTextLocale(defaultLocale);
- assertEquals(defaultLocale, p.getTextLocale());
-
- // Check that we cannot pass a null locale
- try {
- p.setTextLocale(null);
- assertFalse(true);
- }
- catch (IllegalArgumentException iae) {
- // OK !!
- }
- }
-
public void testGetFillPath() {
Paint p = new Paint();
Path path1 = new Path();