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

Fallback to the default values when indexing from local resource.

Browse Source 
If we are indexing from a local resource and the indexable resource does
not provide icon or class name or rank we fall back to the defaults.

Change-Id: Ibbed8b2a92e28799c26f5f80b3f058737535739d
This commit is contained in:
Svetoslav
2014-04-11 15:59:17 -07:00
parent e241ad1867
commit caa0b54cbc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -751,8 +751,13 @@ public class Index {
continue;
}
final int itemIconResId = (item.iconResId == 0) ? iconResId : item.iconResId;
final int itemRank = (item.rank == 0) ? rank : item.rank;
String itemClassName = (TextUtils.isEmpty(item.className))
? className : item.className;
indexFromResource(context, database, localeStr,
item.xmlResId, item.className, item.iconResId, item.rank,
item.xmlResId, itemClassName, itemIconResId, itemRank,
item.intentAction, item.intentTargetPackage,
item.intentTargetClass, doNotIndexKeys);
}