summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-10-16 19:08:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-16 19:08:48 -0700
commitfa71ba2c847622c0b23321477b3914f4a4cdd536 (patch)
tree9e122fe01e258e41d77402d2630c419720d5c2de /api
parentaa2804aa2bf1a2c89af947501549361945ffac3f (diff)
parent1b85122bd22c4528679ae8bd67077dfc2fdf1847 (diff)
downloadframeworks_base-fa71ba2c847622c0b23321477b3914f4a4cdd536.zip
frameworks_base-fa71ba2c847622c0b23321477b3914f4a4cdd536.tar.gz
frameworks_base-fa71ba2c847622c0b23321477b3914f4a4cdd536.tar.bz2
am 1b85122b: Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev
* commit '1b85122bd22c4528679ae8bd67077dfc2fdf1847': Add API to enable mipmaps on Bitmap Bug #7353771
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index e90920d..bd7fffd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8263,6 +8263,7 @@ package android.graphics {
method public int getScaledWidth(int);
method public final int getWidth();
method public final boolean hasAlpha();
+ method public final boolean hasMipMap();
method public final boolean isMutable();
method public final boolean isPremultiplied();
method public final boolean isRecycled();
@@ -8271,6 +8272,7 @@ package android.graphics {
method public boolean sameAs(android.graphics.Bitmap);
method public void setDensity(int);
method public void setHasAlpha(boolean);
+ method public final void setHasMipMap(boolean);
method public void setPixel(int, int, int);
method public void setPixels(int[], int, int, int, int, int, int);
method public void writeToParcel(android.os.Parcel, int);