diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-17 21:06:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 21:06:07 +0000 |
| commit | 95b6fdebb42cfc2c1c04284fc218ca4acec09ee2 (patch) | |
| tree | b4fff5c74dfedc35f0a3e4b7615132e0c1eb5d3e /api | |
| parent | e222a44429c3c1b662783afee67dc86edf38d546 (diff) | |
| parent | 373954a1fd371a23c420aeeea9ccbc4d983733d7 (diff) | |
| download | frameworks_base-95b6fdebb42cfc2c1c04284fc218ca4acec09ee2.zip frameworks_base-95b6fdebb42cfc2c1c04284fc218ca4acec09ee2.tar.gz frameworks_base-95b6fdebb42cfc2c1c04284fc218ca4acec09ee2.tar.bz2 | |
Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index c8f4694..2b85c68 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12305,7 +12305,6 @@ package android.graphics.drawable { method public android.graphics.drawable.Drawable.ConstantState getConstantState(); method public android.graphics.drawable.Drawable getCurrent(); method public android.graphics.Rect getDirtyBounds(); - method public boolean getDither(); method public void getHotspotBounds(android.graphics.Rect); method public int getIntrinsicHeight(); method public int getIntrinsicWidth(); @@ -12322,6 +12321,7 @@ package android.graphics.drawable { method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public void invalidateSelf(); method public boolean isAutoMirrored(); + method public boolean isDither(); method public boolean isFilterBitmap(); method public boolean isStateful(); method public final boolean isVisible(); diff --git a/api/system-current.txt b/api/system-current.txt index e35bb57..a275b8f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12620,7 +12620,6 @@ package android.graphics.drawable { method public android.graphics.drawable.Drawable.ConstantState getConstantState(); method public android.graphics.drawable.Drawable getCurrent(); method public android.graphics.Rect getDirtyBounds(); - method public boolean getDither(); method public void getHotspotBounds(android.graphics.Rect); method public int getIntrinsicHeight(); method public int getIntrinsicWidth(); @@ -12637,6 +12636,7 @@ package android.graphics.drawable { method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public void invalidateSelf(); method public boolean isAutoMirrored(); + method public boolean isDither(); method public boolean isFilterBitmap(); method public boolean isStateful(); method public final boolean isVisible(); |