Merge 24Q3 to AOSP main

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

tests/Android.bp

@@ -49,7 +49,7 @@ android_test {
 
     instrumentation_for: "LatinIME",
 
-    min_sdk_version: "14",
+    min_sdk_version: "19",
     target_sdk_version: "30",
     sdk_version: "current",
 }

tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 @SmallTest
 public class KeyboardLayoutSetNavigateMoreKeysKlpTests

tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java

@@ -16,7 +16,7 @@
 
 package com.android.inputmethod.keyboard;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionCustomTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest

tests/src/com/android/inputmethod/keyboard/action/KlpActionDoneTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionGoTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java

@@ -17,10 +17,11 @@
 package com.android.inputmethod.keyboard.action;
 
 import android.content.res.Resources;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.MediumTest;
+
 import com.android.inputmethod.keyboard.KeyboardLayoutSet;
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.keyboard.internal.KeyboardTextsSet;

tests/src/com/android/inputmethod/keyboard/action/KlpActionNextTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionNoneTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionPreviousTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionSearchTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionSendTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/LxxActionCustomTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest

tests/src/com/android/inputmethod/keyboard/action/LxxActionDoneTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/LxxActionGoTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/LxxActionNextTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/LxxActionNoneTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 

tests/src/com/android/inputmethod/keyboard/action/LxxActionPreviousTests.java

@@ -16,10 +16,11 @@
 
 package com.android.inputmethod.keyboard.action;
 
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
+import androidx.test.filters.LargeTest;
+
 import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;