Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-17 21:06:02 +00:00
committed by Android (Google) Code Review
parent e222a44429 373954a1fd
commit 95b6fdebb4
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

2
api/system-current.txt
View File

@@ -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();

2
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -363,7 +363,7 @@ public class BitmapDrawable extends Drawable {
}
@Override
public boolean getDither() {
public boolean isDither() {
return mBitmapState.mPaint.isDither();
}

2
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -279,7 +279,7 @@ public abstract class Drawable {
* @return whether this drawable dithers its colors
* @see #setDither(boolean)
*/
public boolean getDither() {
public boolean isDither() {
return false;
}

2
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -167,7 +167,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
@Override
public boolean getDither() {
public boolean isDither() {
return mDrawableContainerState.mDither;
}

2
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -826,7 +826,7 @@ public class GradientDrawable extends Drawable {
}
@Override
public boolean getDither() {
public boolean isDither() {
return mGradientState.mDither;
}

6
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -1248,12 +1248,12 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
}
@Override
public boolean getDither() {
public boolean isDither() {
final Drawable dr = getFirstNonNullDrawable();
if (dr != null) {
return dr.getDither();
return dr.isDither();
} else {
return super.getDither();
return super.isDither();
}
}

2
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -374,7 +374,7 @@ public class NinePatchDrawable extends Drawable {
}
@Override
public boolean getDither() {
public boolean isDither() {
return mPaint == null ? DEFAULT_DITHER : mPaint.isDither();
}

2
graphics/java/android/graphics/drawable/ShapeDrawable.java
View File

@@ -328,7 +328,7 @@ public class ShapeDrawable extends Drawable {
}
@Override
public boolean getDither() {
public boolean isDither() {
return mShapeState.mPaint.isDither();
}