remove duplicated flattenBitmap method

Signed-off-by: Saul Henriquez <[email protected]>
NeoApplications · Sep 20, 2020 · 0011547 · 0011547
1 parent 902ac35
commit 0011547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
@@ -94,8 +94,6 @@
 import com.saggitt.omega.iconpack.IconPackManager;
 import com.saggitt.omega.util.Config;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -857,25 +855,6 @@ public static <T> T notNullOrDefault(T value, T defValue) {
 
     private static List<Runnable> onStart = new ArrayList<>();
 
-    /**
-     * Compresses the bitmap to a byte array for serialization.
-     */
-    public static byte[] flattenBitmap(Bitmap bitmap) {
-        // Try go guesstimate how much space the icon will take when serialized
-        // to avoid unnecessary allocations/copies during the write.
-        int size = bitmap.getWidth() * bitmap.getHeight() * 4;
-        ByteArrayOutputStream out = new ByteArrayOutputStream(size);
-        try {
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-            return out.toByteArray();
-        } catch (IOException e) {
-            Log.w(TAG, "Could not write bitmap");
-            return null;
-        }
-    }
-
     /**
      * ATTENTION: Only ever call this from within LawnchairLauncher.kt
      */

diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java
@@ -39,6 +39,7 @@
 import com.android.launcher3.Utilities;
 import com.android.launcher3.WorkspaceItemInfo;
 import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.icons.GraphicsUtils;
 import com.android.launcher3.logging.FileLog;
 import com.android.launcher3.model.BgDataModel.Callbacks;
 import com.android.launcher3.util.ContentWriter;
@@ -223,7 +224,7 @@ public static void modifyItemInDatabase(Context context, final ItemInfo item, St
             writer.put(Favorites.TITLE_ALIAS, alias);
             writer.put(Favorites.SWIPE_UP_ACTION, swipeUpAction);
             if (updateIcon) {
-                writer.put(Favorites.CUSTOM_ICON, icon != null ? Utilities.flattenBitmap(icon) : null);
+                writer.put(Favorites.CUSTOM_ICON, icon != null ? GraphicsUtils.flattenBitmap(icon) : null);
                 writer.put(Favorites.CUSTOM_ICON_ENTRY, iconEntry != null ? iconEntry.toString() : null);
             }
             return writer;