Implement #15841213 Search - index Developer Option only and only if they have been activated
- do not index Developer Options if they are not activated - index them just after their activation Change-Id: I54fcc6b55a1f29eb6b19d6e14e3158d4a38a6fe6
This commit is contained in:
@@ -1586,9 +1586,22 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
||||
*/
|
||||
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
|
||||
private boolean isShowingDeveloperOptions(Context context) {
|
||||
return context.getSharedPreferences(DevelopmentSettings.PREF_FILE,
|
||||
Context.MODE_PRIVATE).getBoolean(
|
||||
DevelopmentSettings.PREF_SHOW,
|
||||
android.os.Build.TYPE.equals("eng"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SearchIndexableResource> getXmlResourcesToIndex(
|
||||
Context context, boolean enabled) {
|
||||
|
||||
if (!isShowingDeveloperOptions(context)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final SearchIndexableResource sir = new SearchIndexableResource(context);
|
||||
sir.xmlResId = R.xml.development_prefs;
|
||||
return Arrays.asList(sir);
|
||||
@@ -1596,6 +1609,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
|
||||
|
||||
@Override
|
||||
public List<String> getNonIndexableKeys(Context context) {
|
||||
if (!isShowingDeveloperOptions(context)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final List<String> keys = new ArrayList<String>();
|
||||
if (!showEnableOemUnlockPreference()) {
|
||||
keys.add(ENABLE_OEM_UNLOCK);
|
||||
|
Reference in New Issue
Block a user