Merge "Merge similar BaseSearchIndexProvider code together" (af1cd790) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DisplaySettings.java

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -98,17 +98,7 @@ public class DisplaySettings extends DashboardFragment {
	}		}

	public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {		new BaseSearchIndexProvider(R.xml.display_settings) {
	@Override
	public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
	boolean enabled) {
	final ArrayList<SearchIndexableResource> result = new ArrayList<>();

	final SearchIndexableResource sir = new SearchIndexableResource(context);
	sir.xmlResId = R.xml.display_settings;
	result.add(sir);
	return result;
	}

	@Override		@Override
	public List<AbstractPreferenceController> createPreferenceControllers(		public List<AbstractPreferenceController> createPreferenceControllers(

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -105,20 +105,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa
	}		}

	public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {		new BaseSearchIndexProvider(R.xml.accessibility_control_timeout_settings) {
	@Override
	public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
	boolean enabled) {
	final SearchIndexableResource sir = new SearchIndexableResource(context);
	sir.xmlResId = R.xml.accessibility_control_timeout_settings;
	return Arrays.asList(sir);
	}

	@Override
	public List<String> getNonIndexableKeys(Context context) {
	final List<String> keys = super.getNonIndexableKeys(context);
	return keys;
	}

	@Override		@Override
	public List<AbstractPreferenceController> createPreferenceControllers(		public List<AbstractPreferenceController> createPreferenceControllers(

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -507,16 +507,5 @@ public class AccessibilitySettings extends DashboardFragment {
	}		}

	public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {		new BaseSearchIndexProvider(R.xml.accessibility_settings);

	@Override
	public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
	boolean enabled) {
	List<SearchIndexableResource> indexables = new ArrayList<>();
	SearchIndexableResource indexable = new SearchIndexableResource(context);
	indexable.xmlResId = R.xml.accessibility_settings;
	indexables.add(indexable);
	return indexables;
	}
	};
	}		}

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -168,14 +168,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
	}		}

	public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {		new BaseSearchIndexProvider(R.xml.accessibility_magnification_settings) {
	@Override
	public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
	boolean enabled) {
	final SearchIndexableResource sir = new SearchIndexableResource(context);
	sir.xmlResId = R.xml.accessibility_magnification_settings;
	return Arrays.asList(sir);
	}

	@Override		@Override
	protected boolean isPageSearchEnabled(Context context) {		protected boolean isPageSearchEnabled(Context context) {

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -188,16 +188,5 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr
	}		}

	public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {		new BaseSearchIndexProvider(R.xml.accessibility_autoclick_settings);
	@Override
	public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
	boolean enabled) {
	final ArrayList<SearchIndexableResource> result = new ArrayList<>();

	final SearchIndexableResource sir = new SearchIndexableResource(context);
	sir.xmlResId = R.xml.accessibility_autoclick_settings;
	result.add(sir);
	return result;
	}
	};
	}		}