Add icons to the printer list items in settings.

bug:10955751

Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10

1 files changed, 18 insertions, 4 deletions

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index d2d8525..9db2dec 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -32,6 +32,9 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.database.ContentObserver;
 import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -54,6 +57,7 @@ import android.widget.BaseAdapter;
 import android.widget.CompoundButton;
 import android.widget.Filter;
 import android.widget.Filterable;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.TextView;
@@ -293,7 +297,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
             }
         });
 
-        getListView().setEnabled(false);
+        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
         getListView().setAdapter(mPrintersAdapter);
     }
 
@@ -531,24 +535,26 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
                 convertView = getActivity().getLayoutInflater().inflate(
-                        R.layout.preference, parent, false);
+                        R.layout.printer_dropdown_item, parent, false);
             }
 
             PrinterInfo printer = (PrinterInfo) getItem(position);
             CharSequence title = printer.getName();
             CharSequence subtitle = null;
+            Drawable icon = null;
             try {
                 PackageInfo packageInfo = getPackageManager().getPackageInfo(
                         printer.getId().getServiceName().getPackageName(), 0);
                         subtitle = packageInfo.applicationInfo.loadLabel(getPackageManager());
+                        icon = packageInfo.applicationInfo.loadIcon(getPackageManager());
             } catch (NameNotFoundException nnfe) {
                 /* ignore */
             }
 
-            TextView titleView = (TextView) convertView.findViewById(android.R.id.title);
+            TextView titleView = (TextView) convertView.findViewById(R.id.title);
             titleView.setText(title);
 
-            TextView subtitleView = (TextView) convertView.findViewById(android.R.id.summary);
+            TextView subtitleView = (TextView) convertView.findViewById(R.id.subtitle);
             if (!TextUtils.isEmpty(subtitle)) {
                 subtitleView.setText(subtitle);
                 subtitleView.setVisibility(View.VISIBLE);
@@ -557,6 +563,14 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
                 subtitleView.setVisibility(View.GONE);
             }
 
+            ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+            if (icon != null) {
+                iconView.setImageDrawable(icon);
+                iconView.setVisibility(View.VISIBLE);
+            } else {
+                iconView.setVisibility(View.GONE);
+            }
+
             return convertView;
         }