Merge "Cherry-pick b/298680756 fixes to support CTS-Verifier System." into android14-tests-dev

Author: Keyi Gui

apps/CtsVerifier/AndroidManifest.xml

@@ -4516,10 +4516,13 @@
                         android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.SEARCH" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                   android:resource="@xml/searchable"/>
         </activity-alias>
 
 <!--        <activity-alias-->

apps/CtsVerifier/res/menu/test_list_menu.xml

@@ -13,4 +13,10 @@
           android:icon="@android:drawable/ic_menu_save"
           android:title="@string/export"
           android:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/search_test"
+        android:title="@string/search_title"
+        android:actionViewClass="android.widget.SearchView"
+        android:showAsAction="collapseActionView|ifRoom"
+        android:imeOptions="actionSearch" />
 </menu>

apps/CtsVerifier/res/values/strings.xml

@@ -33,6 +33,9 @@
     <string name="fail_and_next_button_text">Fail and Next</string>
     <string name="yes_string">Yes</string>
     <string name="no_string">No</string>
+    <string name="search_label">TestListActivity</string>
+    <string name="search_hint">Search Tests</string>
+    <string name="search_title">Search</string>
 
     <!-- Strings for CtsReportLog warning -->
     <string name="reportlog_warning_title">CTS-Verifier Report Log</string>

apps/CtsVerifier/res/xml/searchable.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/search_label"
+    android:hint="@string/search_hint" >
+</searchable>

apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java

@@ -46,6 +46,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -220,7 +221,13 @@ protected List<TestListItem> getRows() {
             }
         }
 
-        return mDisplayModesTests.getOrDefault(sCurrentDisplayMode.toString(), new ArrayList<>());
+        if (mTestFilter != null) {
+            // Filter test rows dynamically when the filter is specified.
+            return getRowsWithDisplayMode(sCurrentDisplayMode.toString());
+        } else {
+            return mDisplayModesTests.getOrDefault(
+                    sCurrentDisplayMode.toString(), new ArrayList<>());
+        }
     }
 
     /**
@@ -585,6 +592,17 @@ private boolean matchAnyExcludedUserType(String[] userTypes) {
         return false;
     }
 
+    /** Checks whether the title of the test matches the test filter. */
+    private boolean macthTestFilter(String testTitle) {
+        if (mTestFilter == null) {
+            return true;
+        }
+        return testTitle != null
+                && testTitle
+                        .toLowerCase(Locale.getDefault())
+                        .contains(mTestFilter.toLowerCase(Locale.getDefault()));
+    }
+
     private boolean isVisibleBackgroundNonProfileUser() {
         if (!SdkLevel.isAtLeastU()) {
             Log.d(LOG_TAG, "isVisibleBagroundNonProfileUser() returning false on pre-UDC device");
@@ -637,7 +655,8 @@ && hasAllFeatures(test.requiredFeatures)
                     && hasAllActions(test.requiredActions)
                     && matchAllConfigs(mContext, test.requiredConfigs)
                     && matchDisplayMode(test.displayMode, mode)
-                    && !matchAnyExcludedUserType(test.excludedUserTypes)) {
+                    && !matchAnyExcludedUserType(test.excludedUserTypes)
+                    && macthTestFilter(test.title)) {
                 if (test.applicableFeatures == null || hasAnyFeature(test.applicableFeatures)) {
                     // Add suffix in test name if the test is in the folded mode.
                     test.testName = setTestNameSuffix(mode, test.testName);

apps/CtsVerifier/src/com/android/cts/verifier/TestListActivity.java

@@ -37,6 +37,7 @@
 import android.view.View;
 import android.view.Window;
 import android.widget.CompoundButton;
+import android.widget.SearchView;
 import android.widget.Switch;
 import android.widget.Toast;
 
@@ -219,6 +220,28 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         handleSwitchItemSelected();
                     }
                 });
+
+        SearchView searchView = (SearchView) menu.findItem(R.id.search_test).getActionView();
+        searchView.setOnQueryTextListener(
+                new SearchView.OnQueryTextListener() {
+
+                    public boolean onQueryTextSubmit(String query) {
+                        Log.i(TAG, "Got submitted query: " + query);
+                        handleQueryUpdated(query);
+                        return true;
+                    }
+
+                    public boolean onQueryTextChange(String newText) {
+                        if (newText == null || newText.isEmpty()) {
+                            Log.i(TAG, "Clear filter");
+                            handleQueryUpdated(newText);
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }
+                });
+
         return true;
     }
 
@@ -268,6 +291,17 @@ private boolean handleMenuItemSelected(int id) {
         return true;
     }
 
+    /** Triggered when a new query is input. */
+    private void handleQueryUpdated(String query) {
+        if (query != null && !query.isEmpty()) {
+            mAdapter.setTestFilter(query);
+        } else {
+            // Reset the filter as null to show all tests.
+            mAdapter.setTestFilter(/* testFilter= */ null);
+        }
+        mAdapter.loadTestResults();
+    }
+
     /**
      * Sets current display mode to sharedpreferences.
      *

apps/CtsVerifier/src/com/android/cts/verifier/TestListAdapter.java

@@ -102,6 +102,9 @@ public abstract class TestListAdapter extends BaseAdapter {
      */
     protected Map<String, List<TestListItem>> mDisplayModesTests = new HashMap<>();
 
+    /** A keyword to help filter out test cases by the test name. */
+    protected String mTestFilter;
+
     /** {@link ListView} row that is either a test category header or a test. */
     public static class TestListItem {
 
@@ -451,6 +454,10 @@ public void setTestResult(TestResult testResult) {
                 .execute();
     }
 
+    void setTestFilter(String testFilter) {
+        mTestFilter = testFilter;
+    }
+
     class RefreshTestResultsTask extends AsyncTask<Void, Void, RefreshResult> {
 
         @Override