Revert "Introduce set/get FontVariationSettings test cases."
This reverts commit 2e6f9b1133ed9930957fa285d008e4d6927ced51.
Bug: 34378805
Change-Id: Ic18744e214cd5444dca7ae935df4286d6d4b64c7
(cherry picked from commit 9e50016a271f806f7d09d673496f137d59090864)
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 15a3a43..4916ffa 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -900,21 +900,6 @@
}
@Test
- public void testSetGetFontVariationSettings() {
- Paint p = new Paint();
-
- // The default variation settings should be null.
- assertNull(p.getFontVariationSettings());
-
- final String settings = "'wdth' 1.0";
- p.setFontVariationSettings(settings);
- assertEquals(settings, p.getFontVariationSettings());
-
- p.setFontVariationSettings("");
- assertNull(p.getFontVariationSettings());
- }
-
- @Test
public void testGetTextBounds() {
Paint p = new Paint();
p.setTextSize(10);
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 0d8833f..e102ec5 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -3356,22 +3356,6 @@
"\"smcp\" on", mTextView.getFontFeatureSettings());
}
- @UiThreadTest
- @Test
- public void testSetGetFontVariationSettings() {
- mTextView = new TextView(mActivity);
-
- // The default font variation settings should be null.
- assertNull(mTextView.getFontVariationSettings());
-
- final String setting = "'wdth' 2.0";
- mTextView.setFontVariationSettings(setting);
- assertEquals(setting, mTextView.getFontVariationSettings());
-
- mTextView.setFontVariationSettings("");
- assertNull(mTextView.getFontVariationSettings());
- }
-
@Test
public void testGetOffsetForPositionSingleLineLtr() throws Throwable {
// asserts getOffsetPosition returns correct values for a single line LTR text