Merge "chore(non linear font scaling): make FontScaleConverterActivityTest an ironwood test" into udc-dev

core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java

@@ -25,7 +25,8 @@ import static com.google.common.truth.Truth.assertThat;
 import android.app.Activity;
 import android.compat.testing.PlatformCompatChangeRule;
 import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
+import android.platform.test.annotations.IwTest;
+import android.platform.test.annotations.Postsubmit;
 import android.provider.Settings;
 import android.util.PollingCheck;
 import android.view.View;
@@ -59,7 +60,7 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
-@Presubmit
+@Postsubmit
 public class FontScaleConverterActivityTest {
     @Rule
     public ActivityScenarioRule<TestActivity> rule = new ActivityScenarioRule<>(TestActivity.class);
@@ -84,6 +85,7 @@ public class FontScaleConverterActivityTest {
         }
     }
 
+    @IwTest(focusArea = "accessibility")
     @Test
     public void testFontsScaleNonLinearly() {
         final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -114,6 +116,7 @@ public class FontScaleConverterActivityTest {
         )));
     }
 
+    @IwTest(focusArea = "accessibility")
     @Test
     public void testOnConfigurationChanged_doesNotCrash() {
         final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -127,6 +130,7 @@ public class FontScaleConverterActivityTest {
         });
     }
 
+    @IwTest(focusArea = "accessibility")
     @Test
     public void testUpdateConfiguration_doesNotCrash() {
         final ActivityScenario<TestActivity> scenario = rule.getScenario();

core/tests/coretests/src/android/content/res/TEST_MAPPING

@@ -39,5 +39,18 @@
         }
       ]
     }
+  ],
+  "ironwood-postsubmit": [
+    {
+      "name": "FrameworksCoreTests",
+      "options":[
+        {
+            "include-annotation": "android.platform.test.annotations.IwTest"
+        },
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
   ]
 }