Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78

am: 61255c0c93 Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a
2017-04-25 01:02:03 +00:00
parent a705701cdc 61255c0c93
commit 10ad029318
6 changed files with 8 additions and 9 deletions
--- a/src/com/android/settings/search2/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search2/DatabaseIndexingManager.java
@@ -751,7 +751,6 @@ public class DatabaseIndexingManager {
                    .setEntries(null)
                    .setClassName(fragmentName)
                    .setScreenTitle(screenTitle)
-                    .setIconResId(iconResId)
                    .setRank(rank)
                    .setIntentAction(intentAction)
                    .setIntentTargetPackage(intentTargetPackage)
--- a/src/com/android/settings/search2/SearchViewHolder.java
+++ b/src/com/android/settings/search2/SearchViewHolder.java
@@ -69,9 +69,11 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
            iconView.setImageDrawable(appResult.info.loadIcon(pm));
        } else if (result.icon != null) {
            iconView.setImageDrawable(result.icon);
+            // TODO set color of icon
        } else {
            iconView.setBackgroundResource(R.drawable.empty_icon);
        }
+
        bindBreadcrumbView(result);
    }