Revert "Add custom icon pack support"

This reverts commit a535f29.
iRockaRAZER · Mar 6, 2018 · 77394de · 77394de
1 parent 4934ca8
commit 77394de
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 374 deletions.
diff --git a/proguard.flags b/proguard.flags
@@ -107,9 +107,6 @@
   *;
 }
 
--keep class com.google.android.apps.nexuslauncher.CustomIconProvider {
-  *;
-}
 
 -keep class com.google.android.apps.nexuslauncher.CustomDrawableFactory {
   *;

diff --git a/res/values/config.xml b/res/values/config.xml
@@ -104,11 +104,12 @@
 <!-- Hotseat -->
     <bool name="hotseat_transpose_layout_with_orientation">true</bool>
 
+
     <!-- Name of an icon provider class. -->
-    <string name="icon_provider_class" translatable="false">com.google.android.apps.nexuslauncher.CustomIconProvider</string>
+    <string name="icon_provider_class" translatable="false">com.google.android.apps.nexuslauncher.DynamicIconProvider</string>
 
     <!-- Name of a drawable factory class. -->
-    <string name="drawable_factory_class" translatable="false">com.google.android.apps.nexuslauncher.CustomDrawableFactory</string>
+    <string name="drawable_factory_class" translatable="false">com.google.android.apps.nexuslauncher.DynamicDrawableFactory</string>
 
     <!-- Name of a user event dispatcher class. -->
     <string name="user_event_dispatcher_class" translatable="false">com.google.android.apps.nexuslauncher.CustomAppPredictor</string>

diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
@@ -288,13 +288,6 @@
                 android:entryValues="@array/icon_shape_override_paths_values"
                 android:defaultValue=""
                 android:persistent="false" />
-
-            <com.google.android.apps.nexuslauncher.CustomIconPreference
-                android:key="pref_icon_pack"
-                android:title="@string/pref_icon_pack"
-                android:summary="%s"
-                android:defaultValue=""
-                android:persistent="true" />
         </PreferenceCategory>
 
     </PreferenceScreen>

diff --git a/src/com/google/android/apps/nexuslauncher/CustomDrawableFactory.java b/src/com/google/android/apps/nexuslauncher/CustomDrawableFactory.java
diff --git a/src/com/google/android/apps/nexuslauncher/CustomIconPreference.java b/src/com/google/android/apps/nexuslauncher/CustomIconPreference.java
diff --git a/src/com/google/android/apps/nexuslauncher/CustomIconProvider.java b/src/com/google/android/apps/nexuslauncher/CustomIconProvider.java
diff --git a/src/com/google/android/apps/nexuslauncher/CustomIconUtils.java b/src/com/google/android/apps/nexuslauncher/CustomIconUtils.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,9 +107,6 @@ @@
       *;
     }
-    -keep class com.google.android.apps.nexuslauncher.CustomIconProvider {
-      *;
-    }
     -keep class com.google.android.apps.nexuslauncher.CustomDrawableFactory {
       *;
@@ Expand Down @@