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

Commit bd3bfc52 authored by Chris Craik's avatar Chris Craik
Browse files

Improve docs for drawable tint and color filters 

bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
parent 3062e570

core/java/android/app/WallpaperManager.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class WallpaperManager { 
        }



        @Override

        public void setColorFilter(ColorFilter cf) {

        public void setColorFilter(ColorFilter colorFilter) {

            throw new UnsupportedOperationException("Not supported with this drawable");

        }

core/java/android/widget/ScrollBarDrawable.java

+6 −6
Original line number Diff line number Diff line
@@ -339,21 +339,21 @@ public class ScrollBarDrawable extends Drawable implements Drawable.Callback { 
    }



    @Override

    public void setColorFilter(ColorFilter cf) {

        mColorFilter = cf;

    public void setColorFilter(ColorFilter colorFilter) {

        mColorFilter = colorFilter;

        mHasSetColorFilter = true;



        if (mVerticalTrack != null) {

            mVerticalTrack.setColorFilter(cf);

            mVerticalTrack.setColorFilter(colorFilter);

        }

        if (mVerticalThumb != null) {

            mVerticalThumb.setColorFilter(cf);

            mVerticalThumb.setColorFilter(colorFilter);

        }

        if (mHorizontalTrack != null) {

            mHorizontalTrack.setColorFilter(cf);

            mHorizontalTrack.setColorFilter(colorFilter);

        }

        if (mHorizontalThumb != null) {

            mHorizontalThumb.setColorFilter(cf);

            mHorizontalThumb.setColorFilter(colorFilter);

        }

    }

core/java/com/android/internal/widget/ActionBarContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ public class ActionBarContainer extends FrameLayout { 
        }



        @Override

        public void setColorFilter(ColorFilter cf) {

        public void setColorFilter(ColorFilter colorFilter) {

        }



        @Override

graphics/java/android/graphics/PorterDuffColorFilter.java

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.graphics;



import android.annotation.NonNull;



/**

 * A color filter that can be used to tint the source pixels using a single

 * color and a specific {@link PorterDuff Porter-Duff composite mode}.
@@ -34,7 +36,7 @@ public class PorterDuffColorFilter extends ColorFilter { 
     * @see #setColor(int)

     * @see #setMode(android.graphics.PorterDuff.Mode)

     */

    public PorterDuffColorFilter(int color, PorterDuff.Mode mode) {

    public PorterDuffColorFilter(int color, @NonNull PorterDuff.Mode mode) {

        mColor = color;

        mMode = mode;

        update();
@@ -93,7 +95,7 @@ public class PorterDuffColorFilter extends ColorFilter { 
     *

     * @hide

     */

    public void setMode(PorterDuff.Mode mode) {

    public void setMode(@NonNull PorterDuff.Mode mode) {

        mMode = mode;

        update();

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -628,8 +628,8 @@ public class BitmapDrawable extends Drawable { 
    }



    @Override

    public void setColorFilter(ColorFilter cf) {

        mBitmapState.mPaint.setColorFilter(cf);

    public void setColorFilter(ColorFilter colorFilter) {

        mBitmapState.mPaint.setColorFilter(colorFilter);

        invalidateSelf();

    }