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

Remove extra IndexProviders that provided bad data.

Browse Source 
Gesture Settings and Wireless settings were indexing
duplicate results that only added complexity to Search.
PowerUsageDetail was never supposed to be indexed.

Bug:33701673
Test: make RunSettingsRoboTests
Change-Id: I45d1fa4bd412c3418acec24f8c98eb4736f220ab
This commit is contained in:
Matthew Fritze
2017-01-26 15:21:24 -08:00
parent 007d120c47
commit 46173a5265
15 changed files with 4 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/gestures/GestureSettings.java
View File

@@ -143,51 +143,4 @@ public class GestureSettings extends DashboardFragment {
mPreferences.add((GesturePreference) preference);
}
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
ArrayList<SearchIndexableResource> result =
new ArrayList<SearchIndexableResource>();
SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.gesture_settings;
result.add(sir);
return result;
}
@Override
public List<String> getNonIndexableKeys(Context context) {
ArrayList<String> result = new ArrayList<String>();
List<PreferenceController> preferenceControllers =
getPreferenceControllers(context);
for (PreferenceController controller : preferenceControllers) {
controller.updateNonIndexableKeys(result);
}
return result;
}
@Override
public List<PreferenceController> getPreferenceControllers(Context context) {
List<PreferenceController> controllers = new ArrayList<>();
AmbientDisplayConfiguration ambientConfig
= new AmbientDisplayConfiguration(context);
controllers.add(new DoubleTapPowerPreferenceController(context,
null /* lifecycle */));
controllers.add(new PickupGesturePreferenceController(context,
null /* lifecycle */, ambientConfig, UserHandle.myUserId()));
controllers.add(new DoubleTapScreenPreferenceController(context,
null /* lifecycle */, ambientConfig, UserHandle.myUserId()));
controllers.add(new SwipeToNotificationPreferenceController(context,
null /* lifecycle */));
controllers.add(new DoubleTwistPreferenceController(context,
null /* lifecycle */));
return controllers;
}
};
}