From 2078bc2358031ef3a191900d9036daf4251911c1 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Mon, 22 May 2017 13:31:54 -0700 Subject: [PATCH] Remove search2 package and put everything into search Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b Fixes: 38502743 Test: make RunSettingsRoboTests --- AndroidManifest.xml | 2 +- src/com/android/settings/SettingsActivity.java | 2 +- .../accounts/AccountPreferenceController.java | 2 +- .../settings/core/PreferenceController.java | 2 +- .../AutoBrightnessPreferenceController.java | 6 ++--- .../CameraLiftTriggerPreferenceController.java | 3 --- .../SwipeToNotificationPreferenceController.java | 3 --- .../android/settings/overlay/FeatureFactory.java | 2 +- .../settings/overlay/FeatureFactoryImpl.java | 4 +-- .../{search2 => search}/AppSearchResult.java | 2 +- .../settings/search/BaseSearchIndexProvider.java | 1 - .../CursorToSearchResultConverter.java | 31 +++++++++++----------- .../DatabaseIndexingManager.java | 16 +++-------- .../{search2 => search}/DatabaseIndexingUtils.java | 5 ++-- .../{search2 => search}/DatabaseResultLoader.java | 7 +++-- .../search/DynamicIndexableContentMonitor.java | 1 - .../{search2 => search}/InlinePayload.java | 5 ++-- .../{search2 => search}/InlineSwitchPayload.java | 4 +-- .../InlineSwitchViewHolder.java | 4 +-- .../InstalledAppResultLoader.java | 5 ++-- .../IntentSearchViewHolder.java | 5 ++-- .../{search2 => search}/ResultPayload.java | 5 ++-- .../{search2 => search}/ResultPayloadUtils.java | 8 ++---- .../{search2 => search}/SavedQueryController.java | 3 ++- .../{search2 => search}/SavedQueryLoader.java | 4 +-- .../{search2 => search}/SavedQueryPayload.java | 3 ++- .../{search2 => search}/SavedQueryRecorder.java | 3 ++- .../{search2 => search}/SavedQueryRemover.java | 3 ++- .../{search2 => search}/SavedQueryViewHolder.java | 3 ++- .../{search2 => search}/SearchActivity.java | 5 ++-- .../{search2 => search}/SearchFeatureProvider.java | 6 ++--- .../SearchFeatureProviderImpl.java | 9 +++---- .../{search2 => search}/SearchFragment.java | 6 ++--- .../settings/{search2 => search}/SearchResult.java | 5 ++-- .../SearchResultDiffCallback.java | 2 +- .../{search2 => search}/SearchResultsAdapter.java | 19 ++++++------- .../{search2 => search}/SearchViewHolder.java | 5 ++-- .../search/SettingsSearchIndexablesProvider.java | 2 -- .../{search2 => search}/XmlParserUtils.java | 4 +-- .../SearchFragmentEspressoTest.java | 2 +- ...hboardFragmentSearchIndexProviderInspector.java | 2 +- .../BuildNumberPreferenceControllerTest.java | 3 +-- .../AutoBrightnessPreferenceControllerTest.java | 5 ++-- .../AssistGesturePreferenceControllerTest.java | 6 ----- ...GestureSensitivityPreferenceControllerTest.java | 10 ------- .../CameraLiftTriggerPreferenceControllerTest.java | 3 --- .../DoubleTapPowerPreferenceControllerTest.java | 2 -- .../DoubleTapScreenPreferenceControllerTest.java | 2 -- .../DoubleTwistPreferenceControllerTest.java | 2 -- .../PIckupGesturePreferenceControllerTest.java | 2 -- ...wipeToNotificationPreferenceControllerTest.java | 2 -- .../CursorToSearchResultConverterTest.java | 16 ++++++----- .../android/settings/search/DataIntegrityTest.java | 1 - .../DatabaseIndexingManagerTest.java | 6 ++++- .../settings/search/DatabaseIndexingUtilsTest.java | 3 --- .../DatabaseResultLoaderTest.java | 8 +++++- .../{search2 => search}/DatabaseRowTest.java | 10 ++++--- .../search/DynamicIndexableContentMonitorTest.java | 1 - .../settings/search/InlineSwitchPayloadTest.java | 2 -- .../search/InlineSwitchViewHolderTest.java | 4 --- .../InstalledAppResultLoaderTest.java | 7 +++-- .../IntentSearchViewHolderTest.java | 8 ++++-- .../{search2 => search}/MockAppLoader.java | 4 ++- .../settings/{search2 => search}/MockDBLoader.java | 4 ++- .../{search2 => search}/ResultPayloadTest.java | 3 ++- .../ResultPayloadUtilsTest.java | 4 ++- .../{search2 => search}/SavedQueryLoaderTest.java | 6 ++++- .../{search2 => search}/SavedQueryPayloadTest.java | 5 +++- .../SavedQueryRecorderAndRemoverTest.java | 7 ++++- .../SavedQueryViewHolderTest.java | 6 ++++- .../search/SearchFeatureProviderImplTest.java | 1 - .../{search2 => search}/SearchFragmentTest.java | 6 ++--- .../search/SearchIndexProviderCodeInspector.java | 1 - .../settings/search/SearchResultBuilderTest.java | 4 +-- .../settings/search/SearchResultsAdapterTest.java | 14 +--------- .../{search2 => search}/SiteMapManagerTest.java | 3 ++- .../android/settings/search/XmlParserUtilTest.java | 1 - .../settings/testutils/FakeFeatureFactory.java | 4 +-- .../android/settings/testutils/XmlTestUtils.java | 2 +- .../shadow/ShadowDatabaseIndexingUtils.java | 2 +- .../settings/search/SearchActivityTest.java | 1 - 81 files changed, 180 insertions(+), 212 deletions(-) rename src/com/android/settings/{search2 => search}/AppSearchResult.java (97%) rename src/com/android/settings/{search2 => search}/CursorToSearchResultConverter.java (87%) rename src/com/android/settings/{search2 => search}/DatabaseIndexingManager.java (98%) rename src/com/android/settings/{search2 => search}/DatabaseIndexingUtils.java (98%) rename src/com/android/settings/{search2 => search}/DatabaseResultLoader.java (98%) rename src/com/android/settings/{search2 => search}/InlinePayload.java (93%) rename src/com/android/settings/{search2 => search}/InlineSwitchPayload.java (98%) rename src/com/android/settings/{search2 => search}/InlineSwitchViewHolder.java (96%) rename src/com/android/settings/{search2 => search}/InstalledAppResultLoader.java (98%) rename src/com/android/settings/{search2 => search}/IntentSearchViewHolder.java (95%) rename src/com/android/settings/{search2 => search}/ResultPayload.java (96%) rename src/com/android/settings/{search2 => search}/ResultPayloadUtils.java (88%) rename src/com/android/settings/{search2 => search}/SavedQueryController.java (98%) rename src/com/android/settings/{search2 => search}/SavedQueryLoader.java (96%) rename src/com/android/settings/{search2 => search}/SavedQueryPayload.java (97%) rename src/com/android/settings/{search2 => search}/SavedQueryRecorder.java (98%) rename src/com/android/settings/{search2 => search}/SavedQueryRemover.java (98%) rename src/com/android/settings/{search2 => search}/SavedQueryViewHolder.java (96%) rename src/com/android/settings/{search2 => search}/SearchActivity.java (93%) rename src/com/android/settings/{search2 => search}/SearchFeatureProvider.java (95%) rename src/com/android/settings/{search2 => search}/SearchFeatureProviderImpl.java (93%) rename src/com/android/settings/{search2 => search}/SearchFragment.java (98%) rename src/com/android/settings/{search2 => search}/SearchResult.java (98%) rename src/com/android/settings/{search2 => search}/SearchResultDiffCallback.java (97%) rename src/com/android/settings/{search2 => search}/SearchResultsAdapter.java (92%) rename src/com/android/settings/{search2 => search}/SearchViewHolder.java (97%) rename src/com/android/settings/{search2 => search}/XmlParserUtils.java (97%) rename tests/app/src/com/android/settings/{search2 => search}/SearchFragmentEspressoTest.java (97%) rename tests/robotests/src/com/android/settings/{search2 => search}/CursorToSearchResultConverterTest.java (96%) rename tests/robotests/src/com/android/settings/{search2 => search}/DatabaseIndexingManagerTest.java (99%) rename tests/robotests/src/com/android/settings/{search2 => search}/DatabaseResultLoaderTest.java (98%) rename tests/robotests/src/com/android/settings/{search2 => search}/DatabaseRowTest.java (95%) rename tests/robotests/src/com/android/settings/{search2 => search}/InstalledAppResultLoaderTest.java (98%) rename tests/robotests/src/com/android/settings/{search2 => search}/IntentSearchViewHolderTest.java (95%) rename tests/robotests/src/com/android/settings/{search2 => search}/MockAppLoader.java (88%) rename tests/robotests/src/com/android/settings/{search2 => search}/MockDBLoader.java (89%) rename tests/robotests/src/com/android/settings/{search2 => search}/ResultPayloadTest.java (95%) rename tests/robotests/src/com/android/settings/{search2 => search}/ResultPayloadUtilsTest.java (94%) rename tests/robotests/src/com/android/settings/{search2 => search}/SavedQueryLoaderTest.java (93%) rename tests/robotests/src/com/android/settings/{search2 => search}/SavedQueryPayloadTest.java (89%) rename tests/robotests/src/com/android/settings/{search2 => search}/SavedQueryRecorderAndRemoverTest.java (90%) rename tests/robotests/src/com/android/settings/{search2 => search}/SavedQueryViewHolderTest.java (92%) rename tests/robotests/src/com/android/settings/{search2 => search}/SearchFragmentTest.java (99%) rename tests/robotests/src/com/android/settings/{search2 => search}/SiteMapManagerTest.java (99%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b04c8ab136..649c14ff2a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -206,7 +206,7 @@ - diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 3e45af7eeb..daa23d6d2e 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -62,7 +62,7 @@ import com.android.settings.dashboard.DashboardSummary; import com.android.settings.development.DevelopmentSettings; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DynamicIndexableContentMonitor; -import com.android.settings.search2.SearchFeatureProvider; +import com.android.settings.search.SearchFeatureProvider; import com.android.settings.wfd.WifiDisplaySettings; import com.android.settings.widget.SwitchBar; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index b0403b873c..03a620bde0 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -49,7 +49,7 @@ import com.android.settings.core.PreferenceController; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.search2.SearchFeatureProviderImpl; +import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceController.java index 002240da8c..2b3a7ab371 100644 --- a/src/com/android/settings/core/PreferenceController.java +++ b/src/com/android/settings/core/PreferenceController.java @@ -18,7 +18,7 @@ package com.android.settings.core; import android.content.Context; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.search2.ResultPayload; +import com.android.settings.search.ResultPayload; import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index f36ed3662f..0cff7556a7 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -21,9 +21,9 @@ import android.support.v7.preference.Preference; import android.util.ArrayMap; import com.android.settings.core.PreferenceController; -import com.android.settings.search2.DatabaseIndexingUtils; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; +import com.android.settings.search.DatabaseIndexingUtils; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; import com.android.settings.R; import java.util.Map; diff --git a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java index 35f4bc6e68..955f747fa7 100644 --- a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java +++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java @@ -20,10 +20,7 @@ import android.content.Context; import android.provider.Settings; import android.support.v7.preference.Preference; -import android.util.ArrayMap; import com.android.settings.R; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import com.android.settingslib.core.lifecycle.Lifecycle; public class CameraLiftTriggerPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index 75cffa5880..b760c2520a 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java @@ -20,9 +20,6 @@ import android.content.Context; import android.provider.Settings; import android.support.v7.preference.Preference; -import android.util.ArrayMap; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import com.android.settingslib.core.lifecycle.Lifecycle; public class SwipeToNotificationPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java index 60893b2979..4c4621abb3 100644 --- a/src/com/android/settings/overlay/FeatureFactory.java +++ b/src/com/android/settings/overlay/FeatureFactory.java @@ -30,8 +30,8 @@ import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; import com.android.settings.gestures.AssistGestureFeatureProvider; import com.android.settings.localepicker.LocaleFeatureProvider; -import com.android.settings.search2.SearchFeatureProvider; import com.android.settings.security.SecurityFeatureProvider; +import com.android.settings.search.SearchFeatureProvider; import com.android.settings.users.UserFeatureProvider; /** diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 21b33c947d..d4ee912a5e 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -43,8 +43,8 @@ import com.android.settings.gestures.AssistGestureFeatureProvider; import com.android.settings.gestures.AssistGestureFeatureProviderImpl; import com.android.settings.localepicker.LocaleFeatureProvider; import com.android.settings.localepicker.LocaleFeatureProviderImpl; -import com.android.settings.search2.SearchFeatureProvider; -import com.android.settings.search2.SearchFeatureProviderImpl; +import com.android.settings.search.SearchFeatureProvider; +import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.security.SecurityFeatureProvider; import com.android.settings.security.SecurityFeatureProviderImpl; import com.android.settings.users.UserFeatureProvider; diff --git a/src/com/android/settings/search2/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java similarity index 97% rename from src/com/android/settings/search2/AppSearchResult.java rename to src/com/android/settings/search/AppSearchResult.java index 111f7756a4..fcb83dc73d 100644 --- a/src/com/android/settings/search2/AppSearchResult.java +++ b/src/com/android/settings/search/AppSearchResult.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.pm.ApplicationInfo; diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 724868efbc..11b4db1215 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -26,7 +26,6 @@ import android.util.Log; import android.util.Xml; import com.android.settings.core.PreferenceController; -import com.android.settings.search2.XmlParserUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java similarity index 87% rename from src/com/android/settings/search2/CursorToSearchResultConverter.java rename to src/com/android/settings/search/CursorToSearchResultConverter.java index 30afbd0b48..1fa3980c84 100644 --- a/src/com/android/settings/search2/CursorToSearchResultConverter.java +++ b/src/com/android/settings/search/CursorToSearchResultConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; import android.content.pm.PackageManager; @@ -37,17 +37,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ICON; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID; -import static com.android.settings.search2.DatabaseResultLoader - .COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_TITLE; +import static com.android.settings.search.DatabaseResultLoader.BASE_RANKS; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_CLASS_NAME; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ICON; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_ID; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_KEY; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_PAYLOAD_TYPE; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SCREEN_TITLE; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_SUMMARY_ON; +import static com.android.settings.search.DatabaseResultLoader.COLUMN_INDEX_TITLE; +import static com.android.settings.search.SearchResult.TOP_RANK; /** * Controller to Build search results from {@link Cursor} Objects. @@ -221,8 +222,8 @@ class CursorToSearchResultConverter { */ private int getRank(String title, List crumbs, int baseRank, String key) { // The result can only be prioritized if it is a top ranked result. - if (prioritySettings.contains(key) && baseRank < DatabaseResultLoader.BASE_RANKS[1]) { - return SearchResult.TOP_RANK; + if (prioritySettings.contains(key) && baseRank < BASE_RANKS[1]) { + return TOP_RANK; } if (title.length() > LONG_TITLE_LENGTH) { return baseRank + 2; diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java similarity index 98% rename from src/com/android/settings/search2/DatabaseIndexingManager.java rename to src/com/android/settings/search/DatabaseIndexingManager.java index 6e36d186b9..0e107747a3 100644 --- a/src/com/android/settings/search2/DatabaseIndexingManager.java +++ b/src/com/android/settings/search/DatabaseIndexingManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.ComponentName; import android.content.ContentResolver; @@ -43,11 +43,6 @@ import android.util.Xml; import com.android.settings.SettingsActivity; import com.android.settings.core.PreferenceController; -import com.android.settings.search.IndexDatabaseHelper; -import com.android.settings.search.Indexable; -import com.android.settings.search.IndexingCallback; -import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.search.SearchIndexableResources; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -84,9 +79,9 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICO import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RANK; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; +import static com.android.settings.search.DatabaseResultLoader.*; import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.CLASS_NAME; import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_ENTRIES; import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS; @@ -111,11 +106,6 @@ import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.SCREE import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.USER_ID; import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_ID; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE; -import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_KEY; -import static com.android.settings.search2.DatabaseResultLoader.SELECT_COLUMNS; - /** * Consumes the SearchIndexableProvider content providers. * Updates the Resource, Raw Data and non-indexable data for Search. diff --git a/src/com/android/settings/search2/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java similarity index 98% rename from src/com/android/settings/search2/DatabaseIndexingUtils.java rename to src/com/android/settings/search/DatabaseIndexingUtils.java index b93fa10ad3..a6f3cb1ab1 100644 --- a/src/com/android/settings/search2/DatabaseIndexingUtils.java +++ b/src/com/android/settings/search/DatabaseIndexingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.Manifest; import android.content.Context; @@ -34,7 +34,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.core.PreferenceController; -import com.android.settings.search.Indexable; import java.lang.reflect.Field; import java.text.Normalizer; diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java similarity index 98% rename from src/com/android/settings/search2/DatabaseResultLoader.java rename to src/com/android/settings/search/DatabaseResultLoader.java index 5892ebc1ed..853e69142a 100644 --- a/src/com/android/settings/search2/DatabaseResultLoader.java +++ b/src/com/android/settings/search/DatabaseResultLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.database.Cursor; @@ -23,8 +24,6 @@ import android.database.sqlite.SQLiteDatabase; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.IndexDatabaseHelper; import com.android.settings.utils.AsyncLoader; import java.util.ArrayList; diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java index bb9f5adf12..07583871d4 100644 --- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java +++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java @@ -54,7 +54,6 @@ import com.android.settings.inputmethod.VirtualKeyboardFragment; import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.overlay.FeatureFactory; import com.android.settings.print.PrintSettingsFragment; -import com.android.settings.search2.DatabaseIndexingManager; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/search2/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java similarity index 93% rename from src/com/android/settings/search2/InlinePayload.java rename to src/com/android/settings/search/InlinePayload.java index 9b1dadd975..b2bb59d1bd 100644 --- a/src/com/android/settings/search2/InlinePayload.java +++ b/src/com/android/settings/search/InlinePayload.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Intent; diff --git a/src/com/android/settings/search2/InlineSwitchPayload.java b/src/com/android/settings/search/InlineSwitchPayload.java similarity index 98% rename from src/com/android/settings/search2/InlineSwitchPayload.java rename to src/com/android/settings/search/InlineSwitchPayload.java index b223ce8c57..8046b72d50 100644 --- a/src/com/android/settings/search2/InlineSwitchPayload.java +++ b/src/com/android/settings/search/InlineSwitchPayload.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; import android.content.Intent; diff --git a/src/com/android/settings/search2/InlineSwitchViewHolder.java b/src/com/android/settings/search/InlineSwitchViewHolder.java similarity index 96% rename from src/com/android/settings/search2/InlineSwitchViewHolder.java rename to src/com/android/settings/search/InlineSwitchViewHolder.java index d4a0ca24a2..2b3642f2f7 100644 --- a/src/com/android/settings/search2/InlineSwitchViewHolder.java +++ b/src/com/android/settings/search/InlineSwitchViewHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; import android.util.Pair; diff --git a/src/com/android/settings/search2/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java similarity index 98% rename from src/com/android/settings/search2/InstalledAppResultLoader.java rename to src/com/android/settings/search/InstalledAppResultLoader.java index 978693cb5e..29668383a5 100644 --- a/src/com/android/settings/search2/InstalledAppResultLoader.java +++ b/src/com/android/settings/search/InstalledAppResultLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.content.Intent; diff --git a/src/com/android/settings/search2/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java similarity index 95% rename from src/com/android/settings/search2/IntentSearchViewHolder.java rename to src/com/android/settings/search/IntentSearchViewHolder.java index e81056a87e..68129b695c 100644 --- a/src/com/android/settings/search2/IntentSearchViewHolder.java +++ b/src/com/android/settings/search/IntentSearchViewHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,8 +12,9 @@ * 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.search2; +package com.android.settings.search; import android.content.ComponentName; import android.content.Intent; diff --git a/src/com/android/settings/search2/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java similarity index 96% rename from src/com/android/settings/search2/ResultPayload.java rename to src/com/android/settings/search/ResultPayload.java index fe4cea0fce..2352ffd3d4 100644 --- a/src/com/android/settings/search2/ResultPayload.java +++ b/src/com/android/settings/search/ResultPayload.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.annotation.IntDef; import android.content.Intent; diff --git a/src/com/android/settings/search2/ResultPayloadUtils.java b/src/com/android/settings/search/ResultPayloadUtils.java similarity index 88% rename from src/com/android/settings/search2/ResultPayloadUtils.java rename to src/com/android/settings/search/ResultPayloadUtils.java index 41d15e22e4..2c908c194d 100644 --- a/src/com/android/settings/search2/ResultPayloadUtils.java +++ b/src/com/android/settings/search/ResultPayloadUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,14 +15,10 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; -import android.os.BadParcelableException; import android.os.Parcel; import android.os.Parcelable; -import android.util.Log; - -import java.io.StreamCorruptedException; /** * Utility class to Marshall and Unmarshall the payloads stored in the SQLite Database diff --git a/src/com/android/settings/search2/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java similarity index 98% rename from src/com/android/settings/search2/SavedQueryController.java rename to src/com/android/settings/search/SavedQueryController.java index 92ca42af73..f6a3ff6972 100644 --- a/src/com/android/settings/search2/SavedQueryController.java +++ b/src/com/android/settings/search/SavedQueryController.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.app.LoaderManager; import android.content.Context; diff --git a/src/com/android/settings/search2/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java similarity index 96% rename from src/com/android/settings/search2/SavedQueryLoader.java rename to src/com/android/settings/search/SavedQueryLoader.java index 245842c49e..0cf5cebcf9 100644 --- a/src/com/android/settings/search2/SavedQueryLoader.java +++ b/src/com/android/settings/search/SavedQueryLoader.java @@ -12,16 +12,16 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.support.annotation.VisibleForTesting; -import com.android.settings.search.IndexDatabaseHelper; import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns; import com.android.settings.utils.AsyncLoader; diff --git a/src/com/android/settings/search2/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java similarity index 97% rename from src/com/android/settings/search2/SavedQueryPayload.java rename to src/com/android/settings/search/SavedQueryPayload.java index 7e0e213fc9..0a151fc08f 100644 --- a/src/com/android/settings/search2/SavedQueryPayload.java +++ b/src/com/android/settings/search/SavedQueryPayload.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.os.Parcel; import android.support.annotation.VisibleForTesting; diff --git a/src/com/android/settings/search2/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java similarity index 98% rename from src/com/android/settings/search2/SavedQueryRecorder.java rename to src/com/android/settings/search/SavedQueryRecorder.java index e2325e8310..466af0b471 100644 --- a/src/com/android/settings/search2/SavedQueryRecorder.java +++ b/src/com/android/settings/search/SavedQueryRecorder.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.ContentValues; import android.content.Context; diff --git a/src/com/android/settings/search2/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java similarity index 98% rename from src/com/android/settings/search2/SavedQueryRemover.java rename to src/com/android/settings/search/SavedQueryRemover.java index 4395cb6c6a..47bb3baa2e 100644 --- a/src/com/android/settings/search2/SavedQueryRemover.java +++ b/src/com/android/settings/search/SavedQueryRemover.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.database.sqlite.SQLiteDatabase; diff --git a/src/com/android/settings/search2/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java similarity index 96% rename from src/com/android/settings/search2/SavedQueryViewHolder.java rename to src/com/android/settings/search/SavedQueryViewHolder.java index e468eb93d5..158f698868 100644 --- a/src/com/android/settings/search2/SavedQueryViewHolder.java +++ b/src/com/android/settings/search/SavedQueryViewHolder.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.view.View; import android.widget.TextView; diff --git a/src/com/android/settings/search2/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java similarity index 93% rename from src/com/android/settings/search2/SearchActivity.java rename to src/com/android/settings/search/SearchActivity.java index 5a8455b68c..61a580b0f1 100644 --- a/src/com/android/settings/search2/SearchActivity.java +++ b/src/com/android/settings/search/SearchActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.app.Activity; import android.app.Fragment; diff --git a/src/com/android/settings/search2/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java similarity index 95% rename from src/com/android/settings/search2/SearchFeatureProvider.java rename to src/com/android/settings/search/SearchFeatureProvider.java index 8a574bae4a..8e30826ec6 100644 --- a/src/com/android/settings/search2/SearchFeatureProvider.java +++ b/src/com/android/settings/search/SearchFeatureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,8 +12,9 @@ * 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.search2; +package com.android.settings.search; import android.app.Activity; import android.content.Context; @@ -21,7 +22,6 @@ import android.view.Menu; import android.view.View; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.search.IndexingCallback; import java.util.List; diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java similarity index 93% rename from src/com/android/settings/search2/SearchFeatureProviderImpl.java rename to src/com/android/settings/search/SearchFeatureProviderImpl.java index 4e47f9db57..725a8ee9f6 100644 --- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java +++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,14 +12,14 @@ * 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.search2; +package com.android.settings.search; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.VisibleForTesting; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -27,9 +27,6 @@ import android.view.MenuItem; import com.android.settings.R; import com.android.settings.applications.PackageManagerWrapperImpl; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.search.IndexingCallback; - -import java.util.concurrent.atomic.AtomicBoolean; /** * FeatureProvider for the refactored search code. diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java similarity index 98% rename from src/com/android/settings/search2/SearchFragment.java rename to src/com/android/settings/search/SearchFragment.java index c2306861ec..e50558bad6 100644 --- a/src/com/android/settings/search2/SearchFragment.java +++ b/src/com/android/settings/search/SearchFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.app.ActionBar; import android.app.Activity; @@ -41,7 +42,6 @@ import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.IndexingCallback; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/com/android/settings/search2/SearchResult.java b/src/com/android/settings/search/SearchResult.java similarity index 98% rename from src/com/android/settings/search2/SearchResult.java rename to src/com/android/settings/search/SearchResult.java index 36fe5b3e59..c0e817c3c5 100644 --- a/src/com/android/settings/search2/SearchResult.java +++ b/src/com/android/settings/search/SearchResult.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.graphics.drawable.Drawable; diff --git a/src/com/android/settings/search2/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java similarity index 97% rename from src/com/android/settings/search2/SearchResultDiffCallback.java rename to src/com/android/settings/search/SearchResultDiffCallback.java index 9bd1bde630..b7bbc66895 100644 --- a/src/com/android/settings/search2/SearchResultDiffCallback.java +++ b/src/com/android/settings/search/SearchResultDiffCallback.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.support.v7.util.DiffUtil; diff --git a/src/com/android/settings/search2/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java similarity index 92% rename from src/com/android/settings/search2/SearchResultsAdapter.java rename to src/com/android/settings/search/SearchResultsAdapter.java index 5da5966ba3..7861b0832a 100644 --- a/src/com/android/settings/search2/SearchResultsAdapter.java +++ b/src/com/android/settings/search/SearchResultsAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.support.annotation.MainThread; @@ -27,15 +28,11 @@ import android.view.View; import android.view.ViewGroup; import com.android.settings.R; -import com.android.settings.search2.ResultPayload.PayloadType; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static com.android.settings.search2.SearchResult.BOTTOM_RANK; -import static com.android.settings.search2.SearchResult.TOP_RANK; - public class SearchResultsAdapter extends RecyclerView.Adapter { private final SearchFragment mFragment; @@ -60,13 +57,13 @@ public class SearchResultsAdapter extends RecyclerView.Adapter final LayoutInflater inflater = LayoutInflater.from(context); final View view; switch (viewType) { - case PayloadType.INTENT: + case ResultPayload.PayloadType.INTENT: view = inflater.inflate(R.layout.search_intent_item, parent, false); return new IntentSearchViewHolder(view); - case PayloadType.INLINE_SWITCH: + case ResultPayload.PayloadType.INLINE_SWITCH: view = inflater.inflate(R.layout.search_inline_switch_item, parent, false); return new InlineSwitchViewHolder(view, context); - case PayloadType.SAVED_QUERY: + case ResultPayload.PayloadType.SAVED_QUERY: view = inflater.inflate(R.layout.search_saved_query_item, parent, false); return new SavedQueryViewHolder(view); default: @@ -138,9 +135,9 @@ public class SearchResultsAdapter extends RecyclerView.Adapter int dbIndex = 0; int appIndex = 0; - int rank = TOP_RANK; + int rank = SearchResult.TOP_RANK; - while (rank <= BOTTOM_RANK) { + while (rank <= SearchResult.BOTTOM_RANK) { while ((dbIndex < dbSize) && (databaseResults.get(dbIndex).rank == rank)) { newResults.add(databaseResults.get(dbIndex++)); } diff --git a/src/com/android/settings/search2/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java similarity index 97% rename from src/com/android/settings/search2/SearchViewHolder.java rename to src/com/android/settings/search/SearchViewHolder.java index f2fdc70ddc..93409eec0c 100644 --- a/src/com/android/settings/search2/SearchViewHolder.java +++ b/src/com/android/settings/search/SearchViewHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,8 +12,9 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.content.pm.PackageManager; diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index 1bf0a153f7..f7c2a16b2f 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -23,8 +23,6 @@ import android.provider.SearchIndexableResource; import android.provider.SearchIndexablesProvider; import android.util.Log; -import com.android.settings.search2.DatabaseIndexingUtils; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/src/com/android/settings/search2/XmlParserUtils.java b/src/com/android/settings/search/XmlParserUtils.java similarity index 97% rename from src/com/android/settings/search2/XmlParserUtils.java rename to src/com/android/settings/search/XmlParserUtils.java index 17f1743401..c81381c96b 100644 --- a/src/com/android/settings/search2/XmlParserUtils.java +++ b/src/com/android/settings/search/XmlParserUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; import android.content.res.TypedArray; diff --git a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java similarity index 97% rename from tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java rename to tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java index e6fe899741..2d89721e48 100644 --- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java +++ b/tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.support.test.filters.SmallTest; import android.support.test.rule.ActivityTestRule; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 6b22f7b544..d102ab4cd3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -21,7 +21,7 @@ import android.content.Context; import com.android.settings.core.PreferenceController; import com.android.settings.search.Indexable; -import com.android.settings.search2.DatabaseIndexingUtils; +import com.android.settings.search.DatabaseIndexingUtils; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 8dcb7d5a8e..40190d49af 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -29,7 +29,7 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.development.DevelopmentSettings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.DatabaseIndexingManager; +import com.android.settings.search.DatabaseIndexingManager; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,7 +41,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 6d8696f154..a7da8570aa 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -20,9 +20,8 @@ import android.content.Context; import android.provider.Settings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.gestures.DoubleTapPowerPreferenceController; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java index e83e237090..9bf8438326 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java @@ -23,8 +23,6 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,12 +32,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import java.util.ArrayList; -import java.util.List; - import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java index 229ef49688..c4b33546e3 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java @@ -23,25 +23,15 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; -import java.util.ArrayList; -import java.util.List; - -import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED; -import static android.provider.Settings.Secure.ASSIST_GESTURE_SENSITIVITY; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java index 3ea26abfeb..c3c9379848 100644 --- a/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java @@ -24,8 +24,6 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.R; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,7 +32,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import static android.provider.Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index d7961e3a8e..3e0df89cd0 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -23,8 +23,6 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 442d11dffe..9958bce210 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -22,8 +22,6 @@ import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 8393fc3b9f..81dc1fb290 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -24,8 +24,6 @@ import android.provider.Settings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java index 46c0f65742..d21a8c741e 100644 --- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java @@ -22,8 +22,6 @@ import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index cf26cb2b84..8a83e2705e 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -22,8 +22,6 @@ import android.provider.Settings; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java similarity index 96% rename from tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java rename to tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java index 7d0572947a..b43846db01 100644 --- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java +++ b/tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -15,26 +15,30 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.MatrixCursor; -import android.graphics.Matrix; import android.graphics.drawable.Drawable; import android.util.ArrayMap; import com.android.settings.DisplaySettings; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; -import com.android.settings.SubSettings; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; import com.android.settings.gestures.SwipeToNotificationSettings; -import com.android.settings.search2.ResultPayload.PayloadType; - +import com.android.settings.search.CursorToSearchResultConverter; +import com.android.settings.search.DatabaseResultLoader; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.ResultPayload.PayloadType; + +import com.android.settings.search.ResultPayloadUtils; +import com.android.settings.search.SearchResult; import com.android.settings.wifi.WifiSettings; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java index 6ffd704d9e..cb2b678378 100644 --- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java +++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java @@ -10,7 +10,6 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.codeinspection.CodeInspector; import com.android.settings.datausage.DataUsageSummary; -import com.android.settings.search2.DatabaseIndexingUtils; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java rename to tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index 6bf421f27a..85ad49543c 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.annotation.NonNull; import android.annotation.Nullable; @@ -36,8 +36,12 @@ import android.util.ArrayMap; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.DatabaseIndexingManager; import com.android.settings.search.IndexDatabaseHelper; import com.android.settings.search.IndexingCallback; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.ResultPayloadUtils; +import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java index 12ee5ae555..a4fa373633 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java @@ -26,10 +26,7 @@ import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.PreferenceController; -import com.android.settings.display.AutoBrightnessPreferenceController; -import com.android.settings.search2.DatabaseIndexingUtils; import com.android.settings.deviceinfo.SystemUpdatePreferenceController; -import com.android.settings.search2.ResultPayload; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java rename to tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java index 3b6591363f..47824097b0 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.ContentValues; import android.content.Context; @@ -25,7 +25,13 @@ import android.database.sqlite.SQLiteDatabase; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; +import com.android.settings.search.DatabaseIndexingUtils; +import com.android.settings.search.DatabaseResultLoader; import com.android.settings.search.IndexDatabaseHelper; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.ResultPayloadUtils; +import com.android.settings.search.SearchResult; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java rename to tests/robotests/src/com/android/settings/search/DatabaseRowTest.java index f3a25ed855..db4227b56a 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.ComponentName; import android.content.Intent; @@ -23,12 +23,14 @@ import android.content.Context; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow; -import com.android.settings.search2.DatabaseIndexingManager.DatabaseRow.Builder; +import com.android.settings.search.DatabaseIndexingManager.DatabaseRow; +import com.android.settings.search.DatabaseIndexingManager.DatabaseRow.Builder; +import com.android.settings.search.InlineSwitchPayload; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.ResultPayloadUtils; import org.junit.Before; import org.junit.Test; -import org.junit.runner.Result; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java index 79c0d63251..8d585e515d 100644 --- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java +++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java @@ -62,7 +62,6 @@ import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.print.PrintSettingsFragment; -import com.android.settings.search2.DatabaseIndexingManager; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager; import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index 03c7eed879..7167df0b7e 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -24,8 +24,6 @@ import android.content.Context; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.ResultPayload; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java index c72d4e87a5..362184716c 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java @@ -26,10 +26,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.InlineSwitchPayload; -import com.android.settings.search2.InlineSwitchViewHolder; -import com.android.settings.search2.SearchFragment; -import com.android.settings.search2.SearchResult; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java rename to tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java index e808946799..e167091957 100644 --- a/tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.content.Intent; @@ -27,6 +28,8 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.dashboard.SiteMapManager; +import com.android.settings.search.InstalledAppResultLoader; +import com.android.settings.search.SearchResult; import com.android.settings.testutils.ApplicationTestUtils; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java rename to tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java index 607f293c3f..9d0add62d8 100644 --- a/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java @@ -15,7 +15,7 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.ComponentName; import android.content.Context; @@ -29,7 +29,11 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.SearchResult.Builder; +import com.android.settings.search.IntentSearchViewHolder; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.SearchFragment; +import com.android.settings.search.SearchResult; +import com.android.settings.search.SearchResult.Builder; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java b/tests/robotests/src/com/android/settings/search/MockAppLoader.java similarity index 88% rename from tests/robotests/src/com/android/settings/search2/MockAppLoader.java rename to tests/robotests/src/com/android/settings/search/MockAppLoader.java index 17cda437ff..35e56a15d3 100644 --- a/tests/robotests/src/com/android/settings/search2/MockAppLoader.java +++ b/tests/robotests/src/com/android/settings/search/MockAppLoader.java @@ -15,9 +15,11 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; +import com.android.settings.search.InstalledAppResultLoader; +import com.android.settings.search.SearchResult; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java b/tests/robotests/src/com/android/settings/search/MockDBLoader.java similarity index 89% rename from tests/robotests/src/com/android/settings/search2/MockDBLoader.java rename to tests/robotests/src/com/android/settings/search/MockDBLoader.java index 18d877101e..562e3751e1 100644 --- a/tests/robotests/src/com/android/settings/search2/MockDBLoader.java +++ b/tests/robotests/src/com/android/settings/search/MockDBLoader.java @@ -15,9 +15,11 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Context; +import com.android.settings.search.DatabaseResultLoader; +import com.android.settings.search.SearchResult; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java rename to tests/robotests/src/com/android/settings/search/ResultPayloadTest.java index 02906ab515..d18bac384f 100644 --- a/tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java @@ -15,12 +15,13 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Intent; import android.os.Parcel; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.ResultPayload; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java rename to tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index e9a834a742..f3785da121 100644 --- a/tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -15,11 +15,13 @@ * */ -package com.android.settings.search2; +package com.android.settings.search; import android.content.Intent; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.ResultPayloadUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java rename to tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java index 5209ed9808..522236063d 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.ContentValues; @@ -24,6 +25,9 @@ import android.database.sqlite.SQLiteDatabase; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.search.IndexDatabaseHelper; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.SavedQueryLoader; +import com.android.settings.search.SearchResult; import com.android.settings.testutils.DatabaseTestUtils; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java similarity index 89% rename from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java rename to tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java index daa6d5ecc0..3f0936b9de 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java @@ -12,14 +12,17 @@ * 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.search2; +package com.android.settings.search; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.ResultPayload; +import com.android.settings.search.SavedQueryPayload; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java similarity index 90% rename from tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java rename to tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java index ae782790bc..5037626fb5 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java @@ -12,15 +12,20 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.SavedQueryLoader; +import com.android.settings.search.SavedQueryRecorder; +import com.android.settings.search.SavedQueryRemover; +import com.android.settings.search.SearchResult; import com.android.settings.testutils.DatabaseTestUtils; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java similarity index 92% rename from tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java rename to tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java index 5777609308..6927be7dd1 100644 --- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.Context; import android.view.LayoutInflater; @@ -24,6 +25,9 @@ import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.search.SavedQueryViewHolder; +import com.android.settings.search.SearchFragment; +import com.android.settings.search.SearchResult; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index e7331964a5..782ec582e9 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -23,7 +23,6 @@ import android.view.Menu; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.search2.SearchFeatureProviderImpl; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java rename to tests/robotests/src/com/android/settings/search/SearchFragmentTest.java index 2e91ec66f8..94dc2332c9 100644 --- a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.app.LoaderManager; import android.content.Context; @@ -26,7 +27,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search.IndexingCallback; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java index 4730e413e3..b4a91c57fb 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java @@ -22,7 +22,6 @@ import android.util.Log; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.codeinspection.CodeInspector; import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector; -import com.android.settings.search2.DatabaseIndexingManager; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java index 0c496c8de5..8bf4d5ede1 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java @@ -24,9 +24,7 @@ import android.graphics.drawable.Drawable; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.ResultPayload; -import com.android.settings.search2.SearchResult; -import com.android.settings.search2.SearchResult.Builder; +import com.android.settings.search.SearchResult.Builder; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java index 3007f5e26f..c7007589b9 100644 --- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java @@ -27,18 +27,7 @@ import android.widget.FrameLayout; import com.android.settings.R; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; -import com.android.settings.search2.AppSearchResult; -import com.android.settings.search2.DatabaseResultLoader; -import com.android.settings.search2.InlineSwitchViewHolder; -import com.android.settings.search2.InstalledAppResultLoader; -import com.android.settings.search2.ResultPayload; -import com.android.settings.search2.IntentSearchViewHolder; -import com.android.settings.search2.SearchFeatureProvider; -import com.android.settings.search2.SearchFragment; -import com.android.settings.search2.SearchResult; -import com.android.settings.search2.SearchResult.Builder; -import com.android.settings.search2.SearchResultsAdapter; -import com.android.settings.search2.SearchViewHolder; +import com.android.settings.search.SearchResult.Builder; import org.junit.Before; import org.junit.Test; @@ -57,7 +46,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import static com.google.common.truth.Truth.assertThat; diff --git a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java rename to tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java index b8ac8feb0e..2e585ac947 100644 --- a/tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java @@ -12,9 +12,10 @@ * 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.search2; +package com.android.settings.search; import android.content.ContentValues; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java index e35eb10cbb..db5d2b9608 100644 --- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java +++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java @@ -26,7 +26,6 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.R; -import com.android.settings.search2.XmlParserUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 6085c1ea01..8be24965db 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -28,9 +28,9 @@ import com.android.settings.gestures.AssistGestureFeatureProvider; import com.android.settings.localepicker.LocaleFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SupportFeatureProvider; -import com.android.settings.overlay.SurveyFeatureProvider; -import com.android.settings.search2.SearchFeatureProvider; import com.android.settings.security.SecurityFeatureProvider; +import com.android.settings.search.SearchFeatureProvider; +import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settings.users.UserFeatureProvider; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java index f9d5439f9d..4f5600226f 100644 --- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java @@ -7,7 +7,7 @@ import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Xml; -import com.android.settings.search2.XmlParserUtils; +import com.android.settings.search.XmlParserUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java index 724b9c05ec..f824297013 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java @@ -19,7 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.ResolveInfo; -import com.android.settings.search2.DatabaseIndexingUtils; +import com.android.settings.search.DatabaseIndexingUtils; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java index 26b097e720..8a7e3fef81 100644 --- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java +++ b/tests/unit/src/com/android/settings/search/SearchActivityTest.java @@ -25,7 +25,6 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import com.android.settings.Settings; -import com.android.settings.search2.SearchActivity; import org.junit.Test; import org.junit.runner.RunWith; -- 2.11.0