Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0

Change-Id: Ia557b480b9519b0da3e84044c989072a4c90e47c

src/com/android/settings/search/CustomSiteMapRegistry.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import android.util.ArrayMap;
+
+import com.android.settings.DisplaySettings;
+import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.security.SecuritySettings;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.wallpaper.WallpaperSuggestionActivity;
+import com.android.settings.wifi.WifiSettings2;
+
+import java.util.Map;
+
+/**
+ * A registry of custom site map.
+ */
+public class CustomSiteMapRegistry {
+
+    /**
+     * Map from child class to parent class.
+     */
+    public static final Map<String, String> CUSTOM_SITE_MAP;
+
+    static {
+        CUSTOM_SITE_MAP = new ArrayMap<>();
+        CUSTOM_SITE_MAP.put(ScreenLockSettings.class.getName(), SecuritySettings.class.getName());
+        CUSTOM_SITE_MAP.put(
+                WallpaperSuggestionActivity.class.getName(), DisplaySettings.class.getName());
+        CUSTOM_SITE_MAP.put(
+                WifiSettings2.class.getName(), NetworkDashboardFragment.class.getName());
+    }
+}

src/com/android/settings/search/SettingsSearchIndexablesProvider.java

@@ -211,6 +211,14 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
                         .add(SearchIndexablesContract.SiteMapColumns.CHILD_TITLE, childTitle);
             }
         }
+
+        // Loop through custom site map registry to build additional SiteMapPairs
+        for (String childClass : CustomSiteMapRegistry.CUSTOM_SITE_MAP.keySet()) {
+            final String parentClass = CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(childClass);
+            cursor.newRow()
+                    .add(SearchIndexablesContract.SiteMapColumns.PARENT_CLASS, parentClass)
+                    .add(SearchIndexablesContract.SiteMapColumns.CHILD_CLASS, childClass);
+        }
         // Done.
         return cursor;
     }

tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.search;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.DisplaySettings;
+import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.security.SecuritySettings;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.wallpaper.WallpaperSuggestionActivity;
+import com.android.settings.wifi.WifiSettings2;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class CustomSiteMapRegistryTest {
+
+    @Test
+    public void shouldContainScreenLockSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
+                .isEqualTo(SecuritySettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainWallpaperSuggestionActivityPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                WallpaperSuggestionActivity.class.getName()))
+                .isEqualTo(DisplaySettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainWifiSettings2Pairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings2.class.getName()))
+                .isEqualTo(NetworkDashboardFragment.class.getName());
+    }
+}