Snap for 6439596 from c725f6eb67081599d68bc915b72604b350b86ad1 to qt-aml-tzdata-releaseandroid-mainline-10.0.0_r12android-mainline-10.0.0_r11android10-mainline-tzdata-release

Change-Id: Ic8ca7e4f241f992dcfccc22f41e2a50c3fabc33f

3 files changed, 7 insertions, 23 deletions

diff --git a/src/com/android/settings/intelligence/search/SearchViewHolder.java b/src/com/android/settings/intelligence/search/SearchViewHolder.java
index 9123a70..d669e6d 100644
--- a/src/com/android/settings/intelligence/search/SearchViewHolder.java
+++ b/src/com/android/settings/intelligence/search/SearchViewHolder.java
@@ -96,12 +96,7 @@ 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);
-        }
+        breadcrumbView.setText(breadcrumb);
+        breadcrumbView.setVisibility(View.VISIBLE);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/intelligence/search/query/CursorToSearchResultConverter.java b/src/com/android/settings/intelligence/search/query/CursorToSearchResultConverter.java
index a57f510..dad9f14 100644
--- a/src/com/android/settings/intelligence/search/query/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/intelligence/search/query/CursorToSearchResultConverter.java
@@ -27,9 +27,7 @@ import android.graphics.drawable.Drawable;
 import android.os.BadParcelableException;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.ContextThemeWrapper;
 
-import com.android.settings.intelligence.R;
 import com.android.settings.intelligence.search.ResultPayload;
 import com.android.settings.intelligence.search.ResultPayloadUtils;
 import com.android.settings.intelligence.search.SearchResult;
@@ -164,11 +162,7 @@ public class CursorToSearchResultConverter {
         Context packageContext = contextMap.get(pkgName);
         if (packageContext == null) {
             try {
-                final Context themedAppContext = new ContextThemeWrapper(
-                        mContext, R.style.Theme_Settings);
-                packageContext = new ContextThemeWrapper(
-                        themedAppContext.createPackageContext(pkgName, 0),
-                        themedAppContext.getTheme());
+                packageContext = mContext.createPackageContext(pkgName, 0);
                 contextMap.put(pkgName, packageContext);
             } catch (PackageManager.NameNotFoundException e) {
                 Log.e(TAG, "Cannot create Context for package: " + pkgName);
diff --git a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
index 6575cab..8811624 100644
--- a/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
+++ b/src/com/android/settings/intelligence/search/sitemap/SiteMapManager.java
@@ -62,9 +62,7 @@ public class SiteMapManager {
             Log.w(TAG, "SiteMap is not initialized yet, skipping");
             return breadcrumbs;
         }
-        if (!TextUtils.isEmpty(screenTitle)) {
-            breadcrumbs.add(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.
@@ -76,10 +74,7 @@ public class SiteMapManager {
                 }
                 return breadcrumbs;
             }
-            final String parentTitle = pair.getParentTitle();
-            if (!TextUtils.isEmpty(parentTitle)) {
-                breadcrumbs.add(0, parentTitle);
-            }
+            breadcrumbs.add(0, pair.getParentTitle());
             currentClass = pair.getParentClass();
             currentTitle = pair.getParentTitle();
         }
@@ -128,4 +123,4 @@ public class SiteMapManager {
         return null;
     }
 
-}
+}
\ No newline at end of file