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

Commit 1766e14e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make Drawable#hasFocusStateSpecified public"

parents 5b812449 6356ad35

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15822,7 +15822,6 @@ package android.graphics.drawable { 
    method public void draw(@NonNull android.graphics.Canvas);

    method @NonNull public android.content.res.ColorStateList getColorStateList();

    method public int getOpacity();

    method public boolean hasFocusStateSpecified();

    method public void invalidateDrawable(@NonNull android.graphics.drawable.Drawable);

    method public void scheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable, long);

    method public void setAlpha(@IntRange(from=0, to=255) int);
@@ -15868,6 +15867,7 @@ package android.graphics.drawable { 
    method public boolean getPadding(@NonNull android.graphics.Rect);

    method @NonNull public int[] getState();

    method @Nullable public android.graphics.Region getTransparentRegion();

    method public boolean hasFocusStateSpecified();

    method public void inflate(@NonNull android.content.res.Resources, @NonNull org.xmlpull.v1.XmlPullParser, @NonNull android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public void inflate(@NonNull android.content.res.Resources, @NonNull org.xmlpull.v1.XmlPullParser, @NonNull android.util.AttributeSet, @Nullable android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method public void invalidateSelf();

api/test-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -1179,10 +1179,6 @@ package android.graphics.drawable { 
    method public android.graphics.Xfermode getXfermode();

  }



  public abstract class Drawable {

    method public boolean hasFocusStateSpecified();

  }



  public class ShapeDrawable extends android.graphics.drawable.Drawable {

    method public void setXfermode(@Nullable android.graphics.Xfermode);

  }

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+0 −1
Original line number Diff line number Diff line
@@ -768,7 +768,6 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback 
        return mLayerState.isStateful();

    }



    /** @hide */

    @Override

    public boolean hasFocusStateSpecified() {

        return mLayerState.hasFocusStateSpecified();

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

+0 −1
Original line number Diff line number Diff line
@@ -759,7 +759,6 @@ public class BitmapDrawable extends Drawable { 
                || super.isStateful();

    }



    /** @hide */

    @Override

    public boolean hasFocusStateSpecified() {

        return mBitmapState.mTint != null && mBitmapState.mTint.hasFocusStateSpecified();

graphics/java/android/graphics/drawable/ColorDrawable.java

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ public class ColorDrawable extends Drawable { 
        return mColorState.mTint != null && mColorState.mTint.isStateful();

    }



    /** @hide */

    @Override

    public boolean hasFocusStateSpecified() {

        return mColorState.mTint != null && mColorState.mTint.hasFocusStateSpecified();