summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorWei-Ta Chen <weita@google.com>2011-01-11 23:16:15 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-11 23:16:15 -0800
commit4b9adfbe7d0cf578b82eb7794c506ad1986854b9 (patch)
treec467cc6c967457740f402d62154a97d7719a1e65 /graphics
parent2ad2bf232714009586c5163e08754886bdd9ea20 (diff)
parent96d3b5e38301f5d4eff01de8730b6021eb167af9 (diff)
downloadframeworks_base-4b9adfbe7d0cf578b82eb7794c506ad1986854b9.zip
frameworks_base-4b9adfbe7d0cf578b82eb7794c506ad1986854b9.tar.gz
frameworks_base-4b9adfbe7d0cf578b82eb7794c506ad1986854b9.tar.bz2
Merge "Correct the API comments." into honeycomb
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/BitmapRegionDecoder.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/BitmapRegionDecoder.java b/graphics/java/android/graphics/BitmapRegionDecoder.java
index 454eb4a..496e0c7 100644
--- a/graphics/java/android/graphics/BitmapRegionDecoder.java
+++ b/graphics/java/android/graphics/BitmapRegionDecoder.java
@@ -39,7 +39,7 @@ public final class BitmapRegionDecoder {
/**
* Create a BitmapRegionDecoder from the specified byte array.
- * Currently only the Jpeg format is supported.
+ * Currently only the JPEG and PNG formats are supported.
*
* @param data byte array of compressed image data.
* @param offset offset into data for where the decoder should begin
@@ -67,7 +67,7 @@ public final class BitmapRegionDecoder {
* Create a BitmapRegionDecoder from the file descriptor.
* The position within the descriptor will not be changed when
* this returns, so the descriptor can be used again as is.
- * Currently only the Jpeg format is supported.
+ * Currently only the JPEG and PNG formats are supported.
*
* @param fd The file descriptor containing the data to decode
* @param isShareable If this is true, then the BitmapRegionDecoder may keep a
@@ -89,7 +89,7 @@ public final class BitmapRegionDecoder {
* Create a BitmapRegionDecoder from an input stream.
* The stream's position will be where ever it was after the encoded data
* was read.
- * Currently only the Jpeg format is supported.
+ * Currently only the JPEG and PNG formats are supported.
*
* @param is The input stream that holds the raw data to be decoded into a
* BitmapRegionDecoder.
@@ -126,7 +126,7 @@ public final class BitmapRegionDecoder {
/**
* Create a BitmapRegionDecoder from a file path.
- * Currently only the Jpeg format is supported.
+ * Currently only the JPEG and PNG formats are supported.
*
* @param pathName complete path name for the file to be decoded.
* @param isShareable If this is true, then the BitmapRegionDecoder may keep a