Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2719da25 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

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

parents fa46de5c caa0b54c
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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);
            }