From bfcf2a9044916ea077289dd2af02c243e741335b Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 24 Nov 2015 14:09:20 -0800
Subject: [PATCH] Adding the activity icon in wallpaper list

Change-Id: Id31e6dfdfd2f214e6686d21f2aeeb68762de5893
---
 res/layout/preference_wallpaper_type          | 43 +++++++++++++++++++
 .../settings/WallpaperTypeSettings.java       |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 res/layout/preference_wallpaper_type

diff --git a/res/layout/preference_wallpaper_type b/res/layout/preference_wallpaper_type
new file mode 100644
index 00000000000..48bfffd74f9
--- /dev/null
+++ b/res/layout/preference_wallpaper_type
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+              android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
+
+    <ImageView
+            android:id="@+android:id/icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:scaleType="fitXY"
+            android:layout_marginEnd="16dip"
+            android:contentDescription="@null" />
+
+    <TextView android:id="@+android:id/title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+              android:ellipsize="marquee"
+              android:fadingEdge="horizontal"
+              android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 0ee3c9d789c..77bb532f9ec 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -65,6 +65,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
         // Add Preference items for each of the matching activities
         for (ResolveInfo info : rList) {
             Preference pref = new Preference(getPrefContext());
+            pref.setLayoutResource(R.layout.preference_wallpaper_type);
             Intent prefIntent = new Intent(intent);
             prefIntent.setComponent(new ComponentName(
                     info.activityInfo.packageName, info.activityInfo.name));
@@ -72,6 +73,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
             CharSequence label = info.loadLabel(pm);
             if (label == null) label = info.activityInfo.packageName;
             pref.setTitle(label);
+            pref.setIcon(info.loadIcon(pm));
             parent.addPreference(pref);
         }
     }