diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-29 20:43:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-29 20:43:01 +0000 |
| commit | b3ca6aee2cbd18a4980a2c89a65df5697d646a7d (patch) | |
| tree | 6167a058454013c5b1f391a4e751b3467ec41792 /tests | |
| parent | 5aabc55780154ec72434f25e5f8269e442a4ebc4 (diff) | |
| parent | 8c48d8bea64b95916b18bd41a4fdb58d4d7477be (diff) | |
| download | android_packages_apps_Trebuchet-b3ca6aee2cbd18a4980a2c89a65df5697d646a7d.tar.gz android_packages_apps_Trebuchet-b3ca6aee2cbd18a4980a2c89a65df5697d646a7d.tar.bz2 android_packages_apps_Trebuchet-b3ca6aee2cbd18a4980a2c89a65df5697d646a7d.zip | |
Merge "Changing min sdk to 25" into ub-launcher3-master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index ebab12273..24b5b02fb 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -18,7 +18,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.android.launcher3.tests"> - <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="21" + <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="25" tools:overrideLibrary="android.support.test.uiautomator.v18"/> <application android:debuggable="true"> diff --git a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java index afbedbacd..293b04a58 100644 --- a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java +++ b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java @@ -20,15 +20,14 @@ import static org.junit.Assert.assertTrue; import android.content.ComponentName; -import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; - import com.android.launcher3.AppInfo; -import com.android.launcher3.Utilities; import org.junit.Test; import org.junit.runner.RunWith; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + /** * Unit tests for {@link DefaultAppSearchAlgorithm} */ @@ -78,9 +77,6 @@ public class DefaultAppSearchAlgorithmTest { @Test public void testMatchesVN() { - if (!Utilities.ATLEAST_NOUGAT) { - return; - } assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("다운로드"), "다", MATCHER)); assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("드라이브"), "드", MATCHER)); assertTrue(DefaultAppSearchAlgorithm.matches(getInfo("다운로드 드라이브"), "ㄷ", MATCHER)); |