diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-30 22:39:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 22:39:53 +0000 |
| commit | b438c13265858a593a754acb84af3b14adc05a03 (patch) | |
| tree | 8d8163f8da7d373e40b5804d834c384da461610f /src/com/android/settings/search | |
| parent | 2221cb6f6a00e8bc02eb54dadf8ae0390c5c6fdb (diff) | |
| parent | 2aa322991da364b9be74a6e13a4de314765eadd1 (diff) | |
| download | packages_apps_Settings-b438c13265858a593a754acb84af3b14adc05a03.tar.gz packages_apps_Settings-b438c13265858a593a754acb84af3b14adc05a03.tar.bz2 packages_apps_Settings-b438c13265858a593a754acb84af3b14adc05a03.zip | |
am 2aa32299: Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
* commit '2aa322991da364b9be74a6e13a4de314765eadd1':
Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app
Diffstat (limited to 'src/com/android/settings/search')
| -rw-r--r-- | src/com/android/settings/search/Index.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/search/SearchIndexableResources.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java index f4aebb214..1b1825c4f 100644 --- a/src/com/android/settings/search/Index.java +++ b/src/com/android/settings/search/Index.java @@ -503,7 +503,7 @@ public class Index { } private void addIndexablesForXmlResourceUri(Context packageContext, String packageName, - Uri uri, String[] projection, int baseRank) { + Uri uri, String[] projection, int baseRank) { final ContentResolver resolver = packageContext.getContentResolver(); final Cursor cursor = resolver.query(uri, projection, null, null, null); @@ -550,7 +550,7 @@ public class Index { } private void addIndexablesForRawDataUri(Context packageContext, String packageName, - Uri uri, String[] projection, int baseRank) { + Uri uri, String[] projection, int baseRank) { final ContentResolver resolver = packageContext.getContentResolver(); final Cursor cursor = resolver.query(uri, projection, null, null, null); diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 03804613c..cea57b956 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -226,7 +226,7 @@ public final class SearchIndexableResources { sResMap.put(DeviceInfoSettings.class.getName(), new SearchIndexableResource( Ranking.getRankForClassName(DeviceInfoSettings.class.getName()), - R.xml.device_info_settings, + NO_DATA_RES_ID, DeviceInfoSettings.class.getName(), R.drawable.ic_settings_about)); } |