Merge "Fallback to the default values when indexing from local resource."

2014-04-11 23:38:09 +00:00
parent fa46de5c68 caa0b54cbc
commit 2719da25d8
1 changed files with 6 additions and 1 deletions
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -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);
            }