Merge "Update Search UX for OC" into oc-dev

am: 0cdade8a78 Change-Id: Id21676b0e0fe9cb67474fa977f58e6c647db4fa8
2017-04-25 00:59:33 +00:00
parent 8465bd3adb 0cdade8a78
commit 61255c0c93
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
@@ -749,7 +749,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
@@ -66,9 +66,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);
    }