PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove search2 package and put everything into search

Browse Source 
Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes: 38502743
Test: make RunSettingsRoboTests
This commit is contained in:
Matthew Fritze
2017-05-22 13:31:54 -07:00
parent 45727458f9
commit 2078bc2358
81 changed files with 179 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
View File

@@ -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;

5
tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
View File

@@ -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;

10
tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/gestures/CameraLiftTriggerPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
View File

@@ -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;

14
tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java → tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
View File

@@ -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;

1
tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java → tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
View File

@@ -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;

8
tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java → tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
View File

@@ -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;

10
tests/robotests/src/com/android/settings/search2/DatabaseRowTest.java → tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
View File

@@ -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;

1
tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
View File

@@ -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;

7
tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java → tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
View File

@@ -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;

8
tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java → tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/search2/MockAppLoader.java → tests/robotests/src/com/android/settings/search/MockAppLoader.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/search2/MockDBLoader.java → tests/robotests/src/com/android/settings/search/MockDBLoader.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/search2/ResultPayloadTest.java → tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/search2/ResultPayloadUtilsTest.java → tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java → tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
View File

@@ -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;

5
tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java → tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
View File

@@ -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;

7
tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java → tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java → tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
View File

@@ -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;

1
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -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;

6
tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java → tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
View File

@@ -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;

1
tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
View File

@@ -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;

14
tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
View File

@@ -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;

3
tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java → tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
View File

@@ -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;

1
tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
View File

@@ -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;

4
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
View File

@@ -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;

2
tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java
View File

@@ -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;