Deprecate resId field in SearchIndexableResources

Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests

src/com/android/settings/fuelgauge/BatterySaverSettings.java

@@ -25,6 +25,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings.Global;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
@@ -38,10 +39,16 @@ import com.android.settings.Utils;
 import com.android.settings.dashboard.conditional.BatterySaverCondition;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.notification.SettingPref;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class BatterySaverSettings extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener {
+        implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener,
+        Indexable {
     private static final String TAG = "BatterySaverSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     private static final String KEY_TURN_ON_AUTOMATICALLY = "turn_on_automatically";
@@ -219,4 +226,18 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
             }
         }
     }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.battery_saver_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }

src/com/android/settings/location/LocationSettings.java

@@ -27,6 +27,7 @@ import android.location.SettingInjectorService;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.SearchIndexableResource;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
@@ -40,6 +41,8 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
@@ -47,6 +50,7 @@ import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.location.RecentLocationApps;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -77,7 +81,7 @@ import java.util.List;
  * implementation.
  */
 public class LocationSettings extends LocationSettingsBase
-        implements SwitchBar.OnSwitchChangeListener {
+        implements SwitchBar.OnSwitchChangeListener, Indexable {
 
     private static final String TAG = "LocationSettings";
 
@@ -455,4 +459,18 @@ public class LocationSettings extends LocationSettingsBase
             return new SummaryProvider(activity, summaryLoader);
         }
     };
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.location_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }

src/com/android/settings/location/ScanningSettings.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.location;
 
+import android.content.Context;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings.Global;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
@@ -24,11 +26,16 @@ import android.support.v7.preference.PreferenceScreen;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
  */
-public class ScanningSettings extends SettingsPreferenceFragment {
+public class ScanningSettings extends SettingsPreferenceFragment implements Indexable {
     private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning";
     private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning";
 
@@ -81,4 +88,18 @@ public class ScanningSettings extends SettingsPreferenceFragment {
         }
         return true;
     }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.location_scanning;
+                    return Arrays.asList(sir);
+                }
+            };
 }

src/com/android/settings/notification/ZenModeBehaviorSettings.java

@@ -18,7 +18,9 @@ package com.android.settings.notification;
 
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
+import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 import android.support.v14.preference.SwitchPreference;
@@ -30,8 +32,13 @@ import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 
-public class ZenModeBehaviorSettings extends ZenModeSettingsBase {
+import java.util.Arrays;
+import java.util.List;
+
+public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable {
     private static final String KEY_ALARMS = "zen_mode_alarms";
     private static final String KEY_MEDIA = "zen_mode_media";
     private static final String KEY_REMINDERS = "zen_mode_reminders";
@@ -303,4 +310,18 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase {
         NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
     }
 
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.zen_mode_behavior_settings;
+                    return Arrays.asList(sir);
+                }
+            };
+
 }

src/com/android/settings/notification/ZenModeSettings.java

@@ -29,6 +29,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.ConditionProviderService;
 import android.service.notification.ZenModeConfig;
@@ -41,6 +42,8 @@ import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 import com.android.settings.utils.ManagedServiceSettings;
 import com.android.settings.utils.ZenServiceListing;
 import com.android.settingslib.TwoTargetPreference;
@@ -52,7 +55,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-public class ZenModeSettings extends ZenModeSettingsBase {
+public class ZenModeSettings extends ZenModeSettingsBase implements Indexable {
 
     public static final String KEY_VISUAL_SETTINGS = "zen_mode_visual_interruptions_settings";
     private static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_behavior_settings";
@@ -499,4 +502,17 @@ public class ZenModeSettings extends ZenModeSettingsBase {
                     return type + rule.getName().toString();
                 }
             };
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.zen_mode_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }

src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java

@@ -18,7 +18,9 @@ package com.android.settings.notification;
 
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
+import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -26,8 +28,13 @@ import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
 
-public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
+import java.util.Arrays;
+import java.util.List;
+
+public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase implements Indexable {
 
     private static final String KEY_SCREEN_OFF = "screenOff";
     private static final String KEY_SCREEN_ON = "screenOn";
@@ -122,4 +129,18 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
                 suppressedVisualEffects);
         NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
     }
+
+    /**
+     * For Search.
+     */
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.zen_mode_visual_interruptions_settings;
+                    return Arrays.asList(sir);
+                }
+            };
 }

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

@@ -26,7 +26,6 @@ import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.EncryptionAndCredential;
 import com.android.settings.LegalSettings;
-import com.android.settings.R;
 import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -108,15 +107,15 @@ public final class SearchIndexableResources {
     static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
 
     @VisibleForTesting
-    static void addIndex(Class<?> indexClass, @XmlRes int xmlResId) {
+    static void addIndex(Class<?> indexClass) {
-        addIndex(indexClass, xmlResId, null /* targetAction */);
+        addIndex(indexClass, null /* targetAction */);
     }
 
     @VisibleForTesting
-    static void addIndex(Class<?> indexClass, @XmlRes int xmlResId, String targetAction) {
+    static void addIndex(Class<?> indexClass, String targetAction) {
         String className = indexClass.getName();
-        SearchIndexableResource resource = new SearchIndexableResource(0, xmlResId, className,
+        SearchIndexableResource resource = new SearchIndexableResource(
-                NO_RES_ID);
+                0 /* rank */, NO_RES_ID, className, NO_RES_ID);
 
         if (!TextUtils.isEmpty(targetAction)) {
             resource.intentAction = targetAction;
@@ -127,74 +126,73 @@ public final class SearchIndexableResources {
     }
 
     static {
-        addIndex(WifiSettings.class, NO_RES_ID);
+        addIndex(WifiSettings.class);
-        addIndex(NetworkDashboardFragment.class, NO_RES_ID);
+        addIndex(NetworkDashboardFragment.class);
-        addIndex(ConfigureWifiSettings.class, NO_RES_ID);
+        addIndex(ConfigureWifiSettings.class);
-        addIndex(SavedAccessPointsWifiSettings.class, NO_RES_ID);
+        addIndex(SavedAccessPointsWifiSettings.class);
-        addIndex(BluetoothSettings.class, NO_RES_ID);
+        addIndex(BluetoothSettings.class);
-        addIndex(SimSettings.class, NO_RES_ID);
+        addIndex(SimSettings.class);
-        addIndex(DataUsageSummary.class, NO_RES_ID);
+        addIndex(DataUsageSummary.class);
-        addIndex(DataUsageMeteredSettings.class, NO_RES_ID);
+        addIndex(DataUsageMeteredSettings.class);
-        addIndex(ScreenZoomSettings.class, NO_RES_ID);
+        addIndex(ScreenZoomSettings.class);
-        addIndex(DisplaySettings.class, NO_RES_ID, "android.settings.DISPLAY_SETTINGS");
+        addIndex(DisplaySettings.class, "android.settings.DISPLAY_SETTINGS");
-        addIndex(AmbientDisplaySettings.class, NO_RES_ID);
+        addIndex(AmbientDisplaySettings.class);
-        addIndex(WallpaperTypeSettings.class, NO_RES_ID);
+        addIndex(WallpaperTypeSettings.class);
-        addIndex(AppAndNotificationDashboardFragment.class, NO_RES_ID);
+        addIndex(AppAndNotificationDashboardFragment.class);
-        addIndex(SoundSettings.class, NO_RES_ID, "android.settings.SOUND_SETTINGS");
+        addIndex(SoundSettings.class, "android.settings.SOUND_SETTINGS");
-        addIndex(ZenModeSettings.class, R.xml.zen_mode_settings);
+        addIndex(ZenModeSettings.class);
-        addIndex(StorageSettings.class, NO_RES_ID);
+        addIndex(StorageSettings.class);
-        addIndex(PowerUsageAdvanced.class, NO_RES_ID);
+        addIndex(PowerUsageAdvanced.class);
-        addIndex(DefaultAppSettings.class, NO_RES_ID);
+        addIndex(DefaultAppSettings.class);
-        addIndex(ManageAssist.class, NO_RES_ID);
+        addIndex(ManageAssist.class);
-        addIndex(SpecialAccessSettings.class, NO_RES_ID);
+        addIndex(SpecialAccessSettings.class);
-        addIndex(UserSettings.class, NO_RES_ID);
+        addIndex(UserSettings.class);
-        addIndex(AssistGestureSettings.class, NO_RES_ID);
+        addIndex(AssistGestureSettings.class);
-        addIndex(PickupGestureSettings.class, NO_RES_ID);
+        addIndex(PickupGestureSettings.class);
-        addIndex(DoubleTapScreenSettings.class, NO_RES_ID);
+        addIndex(DoubleTapScreenSettings.class);
-        addIndex(DoubleTapPowerSettings.class, NO_RES_ID);
+        addIndex(DoubleTapPowerSettings.class);
-        addIndex(DoubleTwistGestureSettings.class, NO_RES_ID);
+        addIndex(DoubleTwistGestureSettings.class);
-        addIndex(SwipeToNotificationSettings.class, NO_RES_ID);
+        addIndex(SwipeToNotificationSettings.class);
-        addIndex(GestureSettings.class, NO_RES_ID);
+        addIndex(GestureSettings.class);
-        addIndex(LanguageAndInputSettings.class, NO_RES_ID);
+        addIndex(LanguageAndInputSettings.class);
-        addIndex(LocationSettings.class, R.xml.location_settings);
+        addIndex(LocationSettings.class);
-        addIndex(ScanningSettings.class, R.xml.location_scanning);
+        addIndex(ScanningSettings.class);
-        addIndex(SecuritySettings.class, NO_RES_ID);
+        addIndex(SecuritySettings.class);
-        addIndex(EncryptionAndCredential.class, NO_RES_ID);
+        addIndex(EncryptionAndCredential.class);
-        addIndex(ScreenPinningSettings.class, NO_RES_ID);
+        addIndex(ScreenPinningSettings.class);
-        addIndex(UserAndAccountDashboardFragment.class, NO_RES_ID);
+        addIndex(UserAndAccountDashboardFragment.class);
-        addIndex(VirtualKeyboardFragment.class, NO_RES_ID);
+        addIndex(VirtualKeyboardFragment.class);
-        addIndex(AvailableVirtualKeyboardFragment.class, NO_RES_ID);
+        addIndex(AvailableVirtualKeyboardFragment.class);
-        addIndex(PhysicalKeyboardFragment.class, NO_RES_ID);
+        addIndex(PhysicalKeyboardFragment.class);
-        addIndex(BackupSettingsActivity.class, NO_RES_ID);
+        addIndex(BackupSettingsActivity.class);
-        addIndex(BackupSettingsFragment.class, NO_RES_ID);
+        addIndex(BackupSettingsFragment.class);
-        addIndex(DateTimeSettings.class, NO_RES_ID);
+        addIndex(DateTimeSettings.class);
-        addIndex(AccessibilitySettings.class, NO_RES_ID);
+        addIndex(AccessibilitySettings.class);
-        addIndex(PrintSettingsFragment.class, NO_RES_ID);
+        addIndex(PrintSettingsFragment.class);
-        addIndex(DevelopmentSettingsDashboardFragment.class, NO_RES_ID);
+        addIndex(DevelopmentSettingsDashboardFragment.class);
-        addIndex(DeviceInfoSettings.class, NO_RES_ID);
+        addIndex(DeviceInfoSettings.class);
-        addIndex(Status.class, NO_RES_ID);
+        addIndex(Status.class);
-        addIndex(LegalSettings.class, NO_RES_ID);
+        addIndex(LegalSettings.class);
-        addIndex(SystemDashboardFragment.class, NO_RES_ID);
+        addIndex(SystemDashboardFragment.class);
-        addIndex(ResetDashboardFragment.class, NO_RES_ID);
+        addIndex(ResetDashboardFragment.class);
-        addIndex(StorageDashboardFragment.class, NO_RES_ID);
+        addIndex(StorageDashboardFragment.class);
-        addIndex(ConnectedDeviceDashboardFragment.class, NO_RES_ID);
+        addIndex(ConnectedDeviceDashboardFragment.class);
-        addIndex(EnterprisePrivacySettings.class, NO_RES_ID);
+        addIndex(EnterprisePrivacySettings.class);
-        addIndex(PaymentSettings.class, NO_RES_ID);
+        addIndex(PaymentSettings.class);
-        addIndex(TextToSpeechSettings.class, NO_RES_ID);
+        addIndex(TextToSpeechSettings.class);
-        addIndex(TtsEnginePreferenceFragment.class, NO_RES_ID);
+        addIndex(TtsEnginePreferenceFragment.class);
-        addIndex(MagnificationPreferenceFragment.class, NO_RES_ID);
+        addIndex(MagnificationPreferenceFragment.class);
-        addIndex(AccessibilityShortcutPreferenceFragment.class, NO_RES_ID);
+        addIndex(AccessibilityShortcutPreferenceFragment.class);
-        addIndex(ChannelImportanceSettings.class, NO_RES_ID);
+        addIndex(ChannelImportanceSettings.class);
-        addIndex(DreamSettings.class, NO_RES_ID);
+        addIndex(DreamSettings.class);
-        addIndex(SupportDashboardActivity.class, NO_RES_ID);
+        addIndex(SupportDashboardActivity.class);
-        addIndex(AutomaticStorageManagerSettings.class, NO_RES_ID);
+        addIndex(AutomaticStorageManagerSettings.class);
-        addIndex(ConfigureNotificationSettings.class, R.xml.configure_notification_settings);
+        addIndex(ConfigureNotificationSettings.class);
-        addIndex(ZenModeBehaviorSettings.class, R.xml.zen_mode_behavior_settings);
+        addIndex(PowerUsageSummary.class);
-        addIndex(PowerUsageSummary.class, R.xml.power_usage_summary);
+        addIndex(BatterySaverSettings.class);
-        addIndex(BatterySaverSettings.class, R.xml.battery_saver_settings);
+        addIndex(LockscreenDashboardFragment.class);
-        addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings);
+        addIndex(ZenModeBehaviorSettings.class);
-        addIndex(ZenModeVisualInterruptionSettings.class,
+        addIndex(ZenModeVisualInterruptionSettings.class);
-                R.xml.zen_mode_visual_interruptions_settings);
     }
 
     private SearchIndexableResources() {

src/com/android/settings/search/indexing/IndexDataConverter.java

@@ -30,7 +30,6 @@ import android.util.Log;
 import android.util.Xml;
 
 import com.android.settings.core.PreferenceControllerMixin;
-
 import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.ResultPayload;
@@ -44,7 +43,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 

tests/robotests/assets/grandfather_not_implementing_indexable

@@ -1,5 +1,4 @@
 com.android.settings.location.LocationMode
-com.android.settings.notification.ZenModeVisualInterruptionSettings
 com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
 com.android.settings.deviceinfo.SimStatus
 com.android.settings.deviceinfo.PrivateVolumeForget
@@ -27,15 +26,12 @@ com.android.settings.datausage.DataPlanUsageSummary
 com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
 com.android.settings.applications.ManageDomainUrls
 com.android.settings.applications.WriteSettingsDetails
-com.android.settings.location.LocationSettings
 com.android.settings.applications.ProcessStatsSummary
 com.android.settings.users.RestrictedProfileSettings
 com.android.settings.accounts.ChooseAccountActivity
 com.android.settings.accounts.ManagedProfileSettings
 com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
 com.android.settings.applications.AppLaunchSettings
-com.android.settings.fuelgauge.BatterySaverSettings
-com.android.settings.location.ScanningSettings
 com.android.settings.applications.ProcessStatsUi
 com.android.settings.notification.ZenModeScheduleRuleSettings
 com.android.settings.datausage.BillingCycleSettings
@@ -69,8 +65,6 @@ com.android.settings.applications.PremiumSmsAccess
 com.android.settings.applications.UsageAccessDetails
 com.android.settings.applications.AppStorageSettings
 com.android.settings.notification.NotificationAccessSettings
-com.android.settings.notification.ZenModeSettings
-com.android.settings.notification.ZenModeBehaviorSettings
 com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
 com.android.settings.localepicker.LocaleListEditor
 com.android.settings.applications.ExternalSourcesDetails

tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java

@@ -18,7 +18,9 @@ package com.android.settings.fuelgauge;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.provider.SearchIndexableResource;
 
+import com.android.settings.R;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.SwitchBar;
@@ -30,6 +32,8 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BatterySaverSettingsTest {
@@ -58,4 +62,13 @@ public class BatterySaverSettingsTest {
 
         assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isTrue();
     }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mBatterySaverSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.battery_saver_settings);
+    }
 }

tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017 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.location;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ScanningSettingsTest {
+
+    private Context mContext;
+    private ScanningSettings mSettings;
+
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mSettings = new ScanningSettings();
+    }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning);
+    }
+}

tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java

@@ -22,6 +22,7 @@ import static junit.framework.Assert.assertTrue;
 
 import android.app.NotificationManager;
 import android.content.Context;
+import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 
 import com.android.settings.R;
@@ -34,16 +35,20 @@ import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.List;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ZenModeSettingsTest {
 
     private ZenModeSettings.SummaryBuilder mBuilder;
     private Context mContext;
+    private ZenModeSettings mSettings;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application.getApplicationContext();
+        mSettings = new ZenModeSettings();
         mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
     }
 
@@ -72,4 +77,13 @@ public class ZenModeSettingsTest {
                 && result.indexOf(reminders) < result.indexOf(events));
     }
 
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings);
+    }
+
 }

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

@@ -18,18 +18,15 @@ package com.android.settings.search;
 
 import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
 import static com.android.settings.search.SearchIndexableResources.NO_RES_ID;
-
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.spy;
 
-import android.annotation.XmlRes;
 import android.database.Cursor;
 import android.provider.SearchIndexableResource;
-
 import android.text.TextUtils;
-import com.android.settings.R;
+
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wifi.WifiSettings;
 
 import org.junit.After;
@@ -45,9 +42,6 @@ import java.util.Map;
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchIndexableResourcesTest {
 
-    @XmlRes
-    private static final int XML_RES_ID = R.xml.physical_keyboard_settings;
-
     Map<String, SearchIndexableResource> sResMapCopy;
 
     @Before
@@ -69,13 +63,13 @@ public class SearchIndexableResourcesTest {
         assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull();
         final int beforeCount = SearchIndexableResources.values().size();
 
-        SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID);
+        SearchIndexableResources.addIndex(java.lang.String.class);
         final SearchIndexableResource index = SearchIndexableResources
                 .getResourceByName("java.lang.String");
 
         assertThat(index).isNotNull();
         assertThat(index.className).isEqualTo("java.lang.String");
-        assertThat(index.xmlResId).isEqualTo(XML_RES_ID);
+        assertThat(index.xmlResId).isEqualTo(NO_RES_ID);
         assertThat(index.iconResId).isEqualTo(NO_RES_ID);
         final int afterCount = SearchIndexableResources.values().size();
         assertThat(afterCount).isEqualTo(beforeCount + 1);
@@ -95,7 +89,7 @@ public class SearchIndexableResourcesTest {
     @Test
     public void testNonIndexableKeys_GetsKeyFromProvider() {
         SearchIndexableResources.sResMap.clear();
-        SearchIndexableResources.addIndex(FakeIndexProvider.class, 0);
+        SearchIndexableResources.addIndex(FakeIndexProvider.class);
 
         SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());