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

Unverified Commit 6b9b6a88 authored by Stanley Wang's avatar Stanley Wang Committed by shagbag913
Browse files

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
parent ac90e819

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);

        }

    }

}

src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java

+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();

        }