Merge "Add code inspector to ensure fragments implements search." (1e798ff5) · Commits · e / os / android_packages_apps_Settings

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ public class Index {

		public static final String ENTRIES_SEPARATOR = "\|";

		static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
		"SEARCH_INDEX_DATA_PROVIDER";

		// If you change the order of columns here, you SHOULD change the COLUMN_INDEX_XXX values
		private static final String[] SELECT_COLUMNS = new String[] {
		IndexColumns.DATA_RANK, // 0
		@@ -155,9 +158,6 @@ public class Index {
		private static final String HYPHEN = "-";
		private static final String SPACE = " ";

		private static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
		"SEARCH_INDEX_DATA_PROVIDER";

		private static final String NODE_NAME_PREFERENCE_SCREEN = "PreferenceScreen";
		private static final String NODE_NAME_CHECK_BOX_PREFERENCE = "CheckBoxPreference";
		private static final String NODE_NAME_LIST_PREFERENCE = "ListPreference";

tests/robotests/assets/grandfather_not_implementing_index_provider

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment
		com.android.settings.gestures.PickupGestureSettings
		com.android.settings.notification.ConfigureNotificationSettings
		com.android.settings.language.LanguageAndRegionSettings
		com.android.settings.accounts.UserAndAccountDashboardFragment
		com.android.settings.gestures.DoubleTapScreenSettings
		com.android.settings.network.NetworkDashboardFragment
		com.android.settings.applications.AppAndNotificationDashboardFragment
		com.android.settings.gestures.SwipeToNotificationSettings
		com.android.settings.notification.ZenModePrioritySettings
		com.android.settings.gestures.DoubleTapPowerSettings
		com.android.settings.inputmethod.InputAndGestureSettings
		com.android.settings.gestures.DoubleTwistGestureSettings
		No newline at end of file

tests/robotests/assets/grandfather_not_implementing_indexable

0 → 100644

+90 −0

Original line number	Diff line number	Diff line
		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
		com.android.settings.inputmethod.SpellCheckersSettings
		com.android.settings.inputmethod.KeyboardLayoutPickerFragment
		com.android.settings.notification.ZenModeEventRuleSettings
		com.android.settings.fuelgauge.InactiveApps
		com.android.settings.accessibility.CaptionPropertiesFragment
		com.android.settings.accounts.ManageAccountsSettings
		com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
		com.android.settings.deviceinfo.ImeiInformation
		com.android.settings.datausage.DataUsageList
		com.android.settings.vpn2.AppManagementFragment
		com.android.settings.display.NightDisplaySettings
		com.android.settings.vpn2.VpnSettings
		com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
		com.android.settings.applications.ProcessStatsDetail
		com.android.settings.wifi.WifiInfo
		com.android.settings.applications.VrListenerSettings
		com.android.settings.nfc.PaymentSettings
		com.android.settings.inputmethod.VirtualKeyboardFragment
		com.android.settings.bluetooth.DevicePickerFragment
		com.android.settings.inputmethod.UserDictionaryList
		com.android.settings.deviceinfo.Status
		com.android.settings.datausage.DataSaverSummary
		com.android.settings.notification.ChannelNotificationSettings
		com.android.settings.datausage.AppDataUsage
		com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
		com.android.settings.inputmethod.PhysicalKeyboardFragment
		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.notification.ZenModeAutomationSettings
		com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
		com.android.settings.applications.AppLaunchSettings
		com.android.settings.fuelgauge.BatterySaverSettings
		com.android.settings.location.ScanningSettings
		com.android.settings.tts.TextToSpeechSettings
		com.android.settings.applications.ProcessStatsUi
		com.android.settings.fuelgauge.PowerUsageDetail
		com.android.settings.notification.ZenModeScheduleRuleSettings
		com.android.settings.datausage.BillingCycleSettings
		com.android.settings.notification.NotificationStation
		com.android.settings.print.PrintJobSettingsFragment
		com.android.settings.applications.SpecialAccessSettings
		com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
		com.android.settings.accounts.AccountSyncSettings
		com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
		com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
		com.android.settings.inputmethod.AvailableVirtualKeyboardFragment
		com.android.settings.applications.DrawOverlayDetails
		com.android.settings.tts.TtsEngineSettingsFragment
		com.android.settings.backup.ToggleBackupSettingFragment
		com.android.settings.users.UserDetailsSettings
		com.android.settings.datausage.UnrestrictedDataAccess
		com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
		com.android.settings.fuelgauge.BatteryHistoryDetail
		com.android.settings.fuelgauge.PowerUsageSummary
		com.android.settings.applications.RunningServices
		com.android.settings.wifi.p2p.WifiP2pSettings
		com.android.settings.applications.ManageAssist
		com.android.settings.applications.ConfirmConvertToFbe
		com.android.settings.deviceinfo.PublicVolumeSettings
		com.android.settings.applications.InstalledAppDetails
		com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
		com.android.settings.print.PrintServiceSettingsFragment
		com.android.settings.wfd.WifiDisplaySettings
		com.android.settings.notification.AppNotificationSettings
		com.android.settings.deviceinfo.PrivateVolumeSettings
		com.android.settings.users.AppRestrictionsFragment
		com.android.settings.deviceinfo.PrivateVolumeUnmount
		com.android.settings.deletionhelper.AutomaticStorageManagerSettings
		com.android.settings.notification.ZenAccessSettings
		com.android.settings.accessibility.ToggleFontSizePreferenceFragment
		com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment
		com.android.settings.wifi.ConfigureWifiSettings
		com.android.settings.wifi.AdvancedWifiSettings
		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.accessibility.ToggleDaltonizerPreferenceFragment
		com.android.settings.applications.ConvertToFbe
		No newline at end of file

tests/robotests/assets/grandfather_not_implementing_instrumentable

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		com.android.settings.deletionhelper.ActivationWarningFragment
		com.android.settings.core.lifecycle.ObservableDialogFragment
		com.android.settings.applications.AppOpsCategory
		com.android.settings.inputmethod.UserDictionaryLocalePicker

tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package com.android.settings;

		import java.util.List;
		import org.junit.runners.model.InitializationError;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.annotation.Config;
		@@ -23,6 +22,8 @@ import org.robolectric.manifest.AndroidManifest;
		import org.robolectric.res.Fs;
		import org.robolectric.res.ResourcePath;

		import java.util.List;

		/**
		* Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the
		* default behavior for robolectric is just to grab the resource directory in the target package.
		@@ -47,7 +48,7 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
		final String appRoot = "packages/apps/Settings";
		final String manifestPath = appRoot + "/AndroidManifest.xml";
		final String resDir = appRoot + "/res";
		final String assetsDir = appRoot + "/assets";
		final String assetsDir = appRoot + config.assetDir();

		// By adding any resources from libraries we need to the AndroidManifest, we can access
		// them from within the parallel universe's resource loader.