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

Merge "Fix DisplaySettings indexing for Search" into lmp-preview-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-06-09 17:17:24 +00:00
committed by Android (Google) Code Review
parent 16c276a1ff d407f2a05c
commit eae845c42b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DisplaySettings.java
View File

@@ -299,7 +299,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
@Override @Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context, public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) { boolean enabled) {
ArrayList<SearchIndexableResource> result = new ArrayList<>(1); ArrayList<SearchIndexableResource> result =
new ArrayList<SearchIndexableResource>();
SearchIndexableResource sir = new SearchIndexableResource(context); SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.display_settings; sir.xmlResId = R.xml.display_settings;
@@ -310,11 +311,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
@Override @Override
public List<String> getNonIndexableKeys(Context context) { public List<String> getNonIndexableKeys(Context context) {
ArrayList<String> nonIndexableKeys = new ArrayList<>(1); ArrayList<String> result = new ArrayList<String>();
if (!isAutomaticBrightnessAvailable(context.getResources())) { if (!context.getResources().getBoolean(
nonIndexableKeys.add(KEY_AUTO_BRIGHTNESS); com.android.internal.R.bool.config_dreamsSupported)) {
result.add(KEY_SCREEN_SAVER);
} }
return nonIndexableKeys; if (!isAutomaticBrightnessAvailable(context.getResources())) {
result.add(KEY_AUTO_BRIGHTNESS);
}
return result;
} }
}; };
} }