Fix "null" string displaying in the breadcrumbs of search results.
Avoid to add the empty title string to the breadcrumbs.
Fixes: 135046255
Test: maunal
Change-Id: I961e422fbc31a11e12861e21025d92d181ad1486
diff --git a/src/com/android/settings/intelligence/search/SearchViewHolder.java b/src/com/android/settings/intelligence/search/SearchViewHolder.java
index d669e6d..9123a70 100644
--- a/src/com/android/settings/intelligence/search/SearchViewHolder.java
+++ b/src/com/android/settings/intelligence/search/SearchViewHolder.java
@@ -96,7 +96,12 @@
breadcrumb = context.getString(R.string.search_breadcrumb_connector,
breadcrumb, result.breadcrumbs.get(i));
}
- breadcrumbView.setText(breadcrumb);
- breadcrumbView.setVisibility(View.VISIBLE);
+
+ if (TextUtils.isEmpty(breadcrumb) || TextUtils.isEmpty(breadcrumb.trim())) {
+ breadcrumbView.setVisibility(View.GONE);
+ } else {
+ breadcrumbView.setText(breadcrumb);
+ breadcrumbView.setVisibility(View.VISIBLE);
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
index 8811624..6575cab 100644
--- a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
+++ b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
@@ -62,7 +62,9 @@
Log.w(TAG, "SiteMap is not initialized yet, skipping");
return breadcrumbs;
}
- breadcrumbs.add(screenTitle);
+ 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 @@
}
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();
}
@@ -123,4 +128,4 @@
return null;
}
-}
\ No newline at end of file
+}
