commit a9a7b44b18e65f9d51b638c74d931376bfd8a240
author Chris Wren <cwren@android.com> Fri Oct 04 07:55:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 04 07:55:36 2013 -0700
tree 3d49d74de6e86bacd407f069b4209c4433f2e0c4
parent 041d053be51f08c21e3826d6fe51a5ff12adc905
parent b48361b1a1280fb2fcf6405045f70a8ddc4d6df8

am b48361b1: am b86f0769: use PNG as the transport encoding for images

* commit 'b48361b1a1280fb2fcf6405045f70a8ddc4d6df8':
  use PNG as the transport encoding for images

src/com/android/launcher3/LauncherBackupAgent.java

diff --git a/src/com/android/launcher3/LauncherBackupAgent.java b/src/com/android/launcher3/LauncherBackupAgent.java
index 4d06f9c..f29bb1f 100644
--- a/src/com/android/launcher3/LauncherBackupAgent.java
+++ b/src/com/android/launcher3/LauncherBackupAgent.java
@@ -61,8 +61,6 @@
 import java.util.Set;
 import java.util.zip.CRC32;
 
-import static android.graphics.Bitmap.CompressFormat.WEBP;
-
 /**
  * Persist the launcher home state across calamities.
  */
@@ -81,6 +79,9 @@
 
     public static final int IMAGE_COMPRESSION_QUALITY = 75;
 
+    private static final Bitmap.CompressFormat IMAGE_FORMAT =
+            android.graphics.Bitmap.CompressFormat.PNG;
+
     private static BackupManager sBackupManager;
 
     private static final String[] FAVORITE_PROJECTION = {
@@ -776,7 +777,7 @@
         Resource res = new Resource();
         res.dpi = dpi;
         ByteArrayOutputStream os = new ByteArrayOutputStream();
-        if (icon.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
+        if (icon.compress(IMAGE_FORMAT, IMAGE_COMPRESSION_QUALITY, os)) {
             res.data = os.toByteArray();
         }
         return writeCheckedBytes(res);
@@ -803,7 +804,7 @@
             Drawable fullResIcon = iconCache.getFullResIcon(provider.getPackageName(), info.icon);
             Bitmap icon = Utilities.createIconBitmap(fullResIcon, this);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
-            if (icon.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
+            if (icon.compress(IMAGE_FORMAT, IMAGE_COMPRESSION_QUALITY, os)) {
                 widget.icon.data = os.toByteArray();
                 widget.icon.dpi = dpi;
             }
@@ -812,7 +813,7 @@
             widget.preview = new Resource();
             Bitmap preview = previewLoader.generateWidgetPreview(info, null);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
-            if (preview.compress(WEBP, IMAGE_COMPRESSION_QUALITY, os)) {
+            if (preview.compress(IMAGE_FORMAT, IMAGE_COMPRESSION_QUALITY, os)) {
                 widget.preview.data = os.toByteArray();
                 widget.preview.dpi = dpi;
             }