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

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

Browse Source 
* commit '2aa322991da364b9be74a6e13a4de314765eadd1':
  Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app
This commit is contained in:
Fabrice Di Meglio
2014-05-30 22:39:53 +00:00
committed by Android Git Automerger
parent 2221cb6f6a 2aa322991d
commit b438c13265
4 changed files with 91 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/search/Index.java
View File

@@ -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);

2
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -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));
}