summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-06-09 14:11:45 -0700
committerGilles Debunne <debunne@google.com>2010-06-23 10:43:00 -0700
commit03f0292744094ec107ffce71301c394503a31ded (patch)
treecd01b60e4ed28aef6b5e9abc7b86d90dcaba83e1 /graphics
parent84d000e3c4d8883afec1e47662f719c6119cfefc (diff)
downloadframeworks_base-03f0292744094ec107ffce71301c394503a31ded.zip
frameworks_base-03f0292744094ec107ffce71301c394503a31ded.tar.gz
frameworks_base-03f0292744094ec107ffce71301c394503a31ded.tar.bz2
New XmlDocumentProvider class.
Minor changes in the Adapters.java helper class. Extracts data out of a XML document using an XPath-like syntax. Change-Id: I0617b0783f11c86118b42cd8485d54440810c805
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 2313f4c..5394530 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -81,7 +81,7 @@ public class BitmapFactory {
/**
* The pixel density to use for the bitmap. This will always result
* in the returned bitmap having a density set for it (see
- * {@link Bitmap#setDensity(int) Bitmap.setDensity(int)). In addition,
+ * {@link Bitmap#setDensity(int) Bitmap.setDensity(int))}. In addition,
* if {@link #inScaled} is set (which it is by default} and this
* density does not match {@link #inTargetDensity}, then the bitmap
* will be scaled to the target density before being returned.
@@ -507,9 +507,7 @@ public class BitmapFactory {
*
* @param is The input stream that holds the raw data to be decoded into a
* bitmap.
- * @return The decoded bitmap, or null if the image data could not be
- * decoded, or, if opts is non-null, if opts requested only the
- * size be returned (in opts.outWidth and opts.outHeight)
+ * @return The decoded bitmap, or null if the image data could not be decoded.
*/
public static Bitmap decodeStream(InputStream is) {
return decodeStream(is, null, null);