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

Commit 0c24d0a5 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Make BitmapDrawable#setBitmap public"

parents 9d0e5417 bea80a77

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15786,6 +15786,7 @@ package android.graphics.drawable { 
    method public final boolean isAutoMirrored();

    method public void setAlpha(int);

    method public void setAntiAlias(boolean);

    method public void setBitmap(@Nullable android.graphics.Bitmap);

    method public void setColorFilter(android.graphics.ColorFilter);

    method public void setDither(boolean);

    method public void setGravity(int);

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

+5 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.graphics.drawable;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.content.res.ColorStateList;
@@ -238,9 +239,10 @@ public class BitmapDrawable extends Drawable { 
        }

    }



    /** @hide */

    @UnsupportedAppUsage

    public void setBitmap(Bitmap bitmap) {

    /**

     * Switch to a new Bitmap object.

     */

    public void setBitmap(@Nullable Bitmap bitmap) {

        if (mBitmapState.mBitmap != bitmap) {

            mBitmapState.mBitmap = bitmap;

            computeBitmapSize();