summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-06-27 14:15:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-27 14:15:01 -0700
commita2c8a7b5739c1febf8ffbf9461334343bdadab16 (patch)
tree340ef0efc28497984466a9eb774630f8eed324bd /graphics
parent2fdbb37f687ce216add57e70fe8de0fc116feeed (diff)
parentec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172 (diff)
downloadframeworks_base-a2c8a7b5739c1febf8ffbf9461334343bdadab16.zip
frameworks_base-a2c8a7b5739c1febf8ffbf9461334343bdadab16.tar.gz
frameworks_base-a2c8a7b5739c1febf8ffbf9461334343bdadab16.tar.bz2
am ec5039b3: am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit 'ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172': Add WEBP to the list of Image formats that support Compression.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Bitmap.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 12dc93c..40d54bb 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -681,7 +681,8 @@ public final class Bitmap implements Parcelable {
*/
public enum CompressFormat {
JPEG (0),
- PNG (1);
+ PNG (1),
+ WEBP (2);
CompressFormat(int nativeInt) {
this.nativeInt = nativeInt;