Fix "null" string displaying in the breadcrumbs of search results. am: 24096bc912 (a07fb16b) · Commits · e / os / android_packages_apps_SettingsIntelligence

src/com/android/settings/intelligence/search/SearchViewHolder.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -96,7 +96,12 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
		breadcrumb = context.getString(R.string.search_breadcrumb_connector,
		breadcrumb, result.breadcrumbs.get(i));
		}

		if (TextUtils.isEmpty(breadcrumb) \|\| TextUtils.isEmpty(breadcrumb.trim())) {
		breadcrumbView.setVisibility(View.GONE);
		} else {
		breadcrumbView.setText(breadcrumb);
		breadcrumbView.setVisibility(View.VISIBLE);
		}
		}
		}

+8 −3

Original line number	Diff line number	Diff line
		@@ -62,7 +62,9 @@ public class SiteMapManager {
		Log.w(TAG, "SiteMap is not initialized yet, skipping");
		return breadcrumbs;
		}
		if (!TextUtils.isEmpty(screenTitle)) {
		breadcrumbs.add(screenTitle);
		}
		String currentClass = clazz;
		String currentTitle = screenTitle;
		// Look up current page's parent, if found add it to breadcrumb string list, and repeat.
		@@ -74,7 +76,10 @@ public class SiteMapManager {
		}
		return breadcrumbs;
		}
		breadcrumbs.add(0, pair.getParentTitle());
		final String parentTitle = pair.getParentTitle();
		if (!TextUtils.isEmpty(parentTitle)) {
		breadcrumbs.add(0, parentTitle);
		}
		currentClass = pair.getParentClass();
		currentTitle = pair.getParentTitle();
		}