diff options
author | Chris Wren <cwren@android.com> | 2013-10-04 07:55:36 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 07:55:36 -0700 |
commit | a9a7b44b18e65f9d51b638c74d931376bfd8a240 (patch) | |
tree | 3d49d74de6e86bacd407f069b4209c4433f2e0c4 | |
parent | 041d053be51f08c21e3826d6fe51a5ff12adc905 (diff) | |
parent | b48361b1a1280fb2fcf6405045f70a8ddc4d6df8 (diff) | |
download | android_packages_apps_Trebuchet-a9a7b44b18e65f9d51b638c74d931376bfd8a240.tar.gz android_packages_apps_Trebuchet-a9a7b44b18e65f9d51b638c74d931376bfd8a240.tar.bz2 android_packages_apps_Trebuchet-a9a7b44b18e65f9d51b638c74d931376bfd8a240.zip |
am b48361b1: am b86f0769: use PNG as the transport encoding for images
* commit 'b48361b1a1280fb2fcf6405045f70a8ddc4d6df8':
use PNG as the transport encoding for images
-rw-r--r-- | src/com/android/launcher3/LauncherBackupAgent.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherBackupAgent.java b/src/com/android/launcher3/LauncherBackupAgent.java index 4d06f9cf3..f29bb1fad 100644 --- a/src/com/android/launcher3/LauncherBackupAgent.java +++ b/src/com/android/launcher3/LauncherBackupAgent.java @@ -61,8 +61,6 @@ import java.util.List; 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 class LauncherBackupAgent extends BackupAgent { 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 @@ public class LauncherBackupAgent extends BackupAgent { 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 @@ public class LauncherBackupAgent extends BackupAgent { 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 @@ public class LauncherBackupAgent extends BackupAgent { 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; } |