Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1
Change-Id: If27a204b2e8db793efb9b5161449e79b75a4cdfd

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwertz;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGalicianES.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Spanish;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Georgian;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwertz;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Swiss;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Dvorak;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwerty;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGreek.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Greek;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHebrew.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Hebrew;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindi.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Hindi;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.HindiCompact;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.Suppress;
+import androidx.test.filters.Suppress;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwerty;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwertz;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwerty;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIndonesian.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwerty;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Qwerty;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalianCH.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.LayoutBase;
 import com.android.inputmethod.keyboard.layout.Swiss;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Kannada;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.EastSlavic;
 import com.android.inputmethod.keyboard.layout.LayoutBase;

tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKhmerKH.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard.layout.tests;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.layout.Khmer;
 import com.android.inputmethod.keyboard.layout.LayoutBase;