diff options
| author | Wei-Ta Chen <weita@google.com> | 2010-10-01 12:36:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 12:36:05 -0700 |
| commit | eeac43ad3c9b41c1679f3ab36064fa611106faf2 (patch) | |
| tree | f5765635a85c74a991623c7937801f069751a98d /api | |
| parent | 57853559c31154db9c202d653065c592169c5027 (diff) | |
| parent | f7681f84918c27f6a626681ce37ed2a236c44e82 (diff) | |
| download | frameworks_base-eeac43ad3c9b41c1679f3ab36064fa611106faf2.zip frameworks_base-eeac43ad3c9b41c1679f3ab36064fa611106faf2.tar.gz frameworks_base-eeac43ad3c9b41c1679f3ab36064fa611106faf2.tar.bz2 | |
am f7681f84: Do not merge.
Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp
* commit 'f7681f84918c27f6a626681ce37ed2a236c44e82':
Do not merge.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 144 |
1 files changed, 2 insertions, 142 deletions
diff --git a/api/current.xml b/api/current.xml index e49138b..a86617d 100644 --- a/api/current.xml +++ b/api/current.xml @@ -64713,146 +64713,6 @@ > </field> </class> -<class name="BitmapRegionDecoder" - extends="java.lang.Object" - abstract="false" - static="false" - final="true" - deprecated="not deprecated" - visibility="public" -> -<method name="decodeRegion" - return="android.graphics.Bitmap" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="rect" type="android.graphics.Rect"> -</parameter> -<parameter name="options" type="android.graphics.BitmapFactory.Options"> -</parameter> -</method> -<method name="getHeight" - return="int" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getWidth" - return="int" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="isRecycled" - return="boolean" - abstract="false" - native="false" - synchronized="false" - static="false" - final="true" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="newInstance" - return="android.graphics.BitmapRegionDecoder" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="data" type="byte[]"> -</parameter> -<parameter name="offset" type="int"> -</parameter> -<parameter name="length" type="int"> -</parameter> -<parameter name="isShareable" type="boolean"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="newInstance" - return="android.graphics.BitmapRegionDecoder" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="fd" type="java.io.FileDescriptor"> -</parameter> -<parameter name="isShareable" type="boolean"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="newInstance" - return="android.graphics.BitmapRegionDecoder" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="is" type="java.io.InputStream"> -</parameter> -<parameter name="isShareable" type="boolean"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="newInstance" - return="android.graphics.BitmapRegionDecoder" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="pathName" type="java.lang.String"> -</parameter> -<parameter name="isShareable" type="boolean"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="recycle" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -</class> <class name="BitmapShader" extends="android.graphics.Shader" abstract="false" @@ -81014,7 +80874,7 @@ type="float" transient="false" volatile="false" - value="0.0010f" + value="0.001f" static="true" final="true" deprecated="not deprecated" @@ -226751,7 +226611,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="t" type="T"> +<parameter name="arg0" type="T"> </parameter> </method> </interface> |