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

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

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

graphics/java/android/graphics/drawable/BitmapDrawable.java

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

graphics/java/android/graphics/drawable/Drawable.java

@@ -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;
     }
 

graphics/java/android/graphics/drawable/DrawableContainer.java

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

graphics/java/android/graphics/drawable/GradientDrawable.java

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

graphics/java/android/graphics/drawable/LayerDrawable.java

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

graphics/java/android/graphics/drawable/NinePatchDrawable.java

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

graphics/java/android/graphics/drawable/ShapeDrawable.java

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