summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wei-Ta Chen <weita@google.com> 2010-12-07 16:39:13 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-12-07 16:39:13 -0800
commit1fbe4abaf90883787ff2b2f05a01b74b95ba8c76 (patch)
treed2b4aa5a67b37308dd48ee0a8c461593dac0751d
parent8028a951c3aa74990907efb9376d1093d84084af (diff)
parent0e007d7ab9ae4f1be506f4976182609d80d75a5c (diff)
Merge "Unhide inPreferQualityOverSpeed in BitmapFactory.Options."
-rw-r--r--api/current.xml10
-rw-r--r--graphics/java/android/graphics/BitmapFactory.java1
2 files changed, 10 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml
index cdb69644b23a..b90ac5f35e1c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -75700,6 +75700,16 @@
visibility="public"
>
</field>
+<field name="inPreferQualityOverSpeed"
+ type="boolean"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="inPreferredConfig"
type="android.graphics.Bitmap.Config"
transient="false"
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 8450c3a62151..66f8f700a785 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -210,7 +210,6 @@ public class BitmapFactory {
* expense of the decoding speed. Currently the field only affects JPEG
* decode, in the case of which a more accurate, but slightly slower,
* IDCT method will be used instead.
- * @hide
*/
public boolean inPreferQualityOverSpeed;