Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5949a974 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 357ea6a6: am 95b6fdeb: Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev 

* commit '357ea6a6':
  Refactor Drawable.getDither() to isDither()
parents 93b046d6 357ea6a6

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12305,7 +12305,6 @@ package android.graphics.drawable { 
    method public android.graphics.drawable.Drawable.ConstantState getConstantState();

    method public android.graphics.drawable.Drawable.ConstantState getConstantState();

    method public android.graphics.drawable.Drawable getCurrent();

    method public android.graphics.drawable.Drawable getCurrent();

    method public android.graphics.Rect getDirtyBounds();

    method public android.graphics.Rect getDirtyBounds();

    method public boolean getDither();

    method public void getHotspotBounds(android.graphics.Rect);

    method public void getHotspotBounds(android.graphics.Rect);

    method public int getIntrinsicHeight();

    method public int getIntrinsicHeight();

    method public int getIntrinsicWidth();

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

    method public boolean isAutoMirrored();

    method public boolean isAutoMirrored();

    method public boolean isDither();

    method public boolean isFilterBitmap();

    method public boolean isFilterBitmap();

    method public boolean isStateful();

    method public boolean isStateful();

    method public final boolean isVisible();

    method public final boolean isVisible();

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12620,7 +12620,6 @@ package android.graphics.drawable { 
    method public android.graphics.drawable.Drawable.ConstantState getConstantState();

    method public android.graphics.drawable.Drawable.ConstantState getConstantState();

    method public android.graphics.drawable.Drawable getCurrent();

    method public android.graphics.drawable.Drawable getCurrent();

    method public android.graphics.Rect getDirtyBounds();

    method public android.graphics.Rect getDirtyBounds();

    method public boolean getDither();

    method public void getHotspotBounds(android.graphics.Rect);

    method public void getHotspotBounds(android.graphics.Rect);

    method public int getIntrinsicHeight();

    method public int getIntrinsicHeight();

    method public int getIntrinsicWidth();

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

    method public boolean isAutoMirrored();

    method public boolean isAutoMirrored();

    method public boolean isDither();

    method public boolean isFilterBitmap();

    method public boolean isFilterBitmap();

    method public boolean isStateful();

    method public boolean isStateful();

    method public final boolean isVisible();

    method public final boolean isVisible();

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -363,7 +363,7 @@ public class BitmapDrawable extends Drawable { 
    }

    }





    @Override

    @Override

    public boolean getDither() {

    public boolean isDither() {

        return mBitmapState.mPaint.isDither();

        return mBitmapState.mPaint.isDither();

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,7 @@ public abstract class Drawable { 
     * @return whether this drawable dithers its colors

     * @return whether this drawable dithers its colors

     * @see #setDither(boolean)

     * @see #setDither(boolean)

     */

     */

    public boolean getDither() {

    public boolean isDither() {

        return false;

        return false;

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
    }

    }





    @Override

    @Override

    public boolean getDither() {

    public boolean isDither() {

        return mDrawableContainerState.mDither;

        return mDrawableContainerState.mDither;

    }

    }