1 files changed, 1 insertions, 26 deletions

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index a6b02aeb0..1dade8027 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -45,8 +45,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import com.android.launcher3.settings.SettingsProvider;
-
 /**
  * Cache of application icons.  Icons can be made from any thread.
  */
@@ -59,8 +57,6 @@ public class IconCache {
 
     private static final boolean DEBUG = true;
 
-    private IconPackHelper mIconPackHelper;
-
     private static class CacheEntry {
         public Bitmap icon;
         public String title;
@@ -83,9 +79,6 @@ public class IconCache {
 
         // need to set mIconDpi before getting default icon
         mDefaultIcon = makeDefaultIcon();
-
-        mIconPackHelper = new IconPackHelper(context);
-        loadIconPack();
     }
 
     public Drawable getFullResDefaultActivityIcon() {
@@ -133,14 +126,7 @@ public class IconCache {
             resources = null;
         }
         if (resources != null) {
-            int iconId = 0;
-            if (mIconPackHelper != null && mIconPackHelper.isIconPackLoaded()) {
-                iconId = mIconPackHelper.getResourceIdForActivityIcon(info);
-                if (iconId != 0) {
-                    return getFullResIcon(mIconPackHelper.getIconPackResources(), iconId);
-                }
-            }
-            iconId = info.getIconResource();
+            int iconId = info.getIconResource();
             if (iconId != 0) {
                 return getFullResIcon(resources, iconId);
             }
@@ -161,16 +147,6 @@ public class IconCache {
         return b;
     }
 
-    private void loadIconPack() {
-        mIconPackHelper.unloadIconPack();
-        String iconPack = SettingsProvider.getStringCustomDefault(mContext,
-                SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, "");
-        if (!TextUtils.isEmpty(iconPack) && !mIconPackHelper.loadIconPack(iconPack)) {
-            SettingsProvider.putString(mContext,
-                    SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, "");
-        }
-    }
-
     /**
      * Remove any records for the supplied ComponentName.
      */
@@ -202,7 +178,6 @@ public class IconCache {
         synchronized (mCache) {
             mCache.clear();
         }
-        loadIconPack();
     }
 
     /**