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

Revert "Get rid of SearchIndexableResources entirely."

Browse Source 
Fixes: 69266642

This reverts commit ba0077977f.

Change-Id: I9de6914f194a65ba627b2e5e805884f894fc044f
This commit is contained in:
Fan Zhang
2017-11-13 22:48:49 +00:00
parent ba0077977f
commit 6c0c789460
7 changed files with 218 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
View File

@@ -20,6 +20,7 @@ import static junit.framework.Assert.fail;
import android.content.Context;
import android.platform.test.annotations.Presubmit;
import android.provider.SearchIndexableResource;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
@@ -27,7 +28,7 @@ import android.util.ArraySet;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SettingsSearchIndexablesProvider;
import com.android.settings.search.SearchIndexableResources;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
@@ -53,7 +54,7 @@ public class PreferenceControllerContractTest {
public void controllersInSearchShouldImplementPreferenceControllerMixin() {
final Set<String> errorClasses = new ArraySet<>();
for (Class clazz: SettingsSearchIndexablesProvider.INDEXABLES) {
for (Class clazz: SearchIndexableResources.providerValues()) {
final Indexable.SearchIndexProvider provider =
DatabaseIndexingUtils.getSearchIndexProvider(clazz);

4
tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
View File

@@ -33,7 +33,7 @@ import android.util.Xml;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SettingsSearchIndexablesProvider;
import com.android.settings.search.SearchIndexableResources;
import com.android.settings.search.XmlParserUtils;
import org.junit.Before;
@@ -90,7 +90,7 @@ public class UniquePreferenceTest {
final Set<String> uniqueKeys = new HashSet<>();
final Set<String> nullKeyClasses = new HashSet<>();
final Set<String> duplicatedKeys = new HashSet<>();
for (Class<?> clazz : SettingsSearchIndexablesProvider.INDEXABLES) {
for (Class<?> clazz : SearchIndexableResources.providerValues()) {
verifyPreferenceIdInXml(uniqueKeys, duplicatedKeys, nullKeyClasses, clazz);
}