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

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

Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev

parents 0d6c3a69 d2afdab2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13814,6 +13814,7 @@ package android.graphics { 
package android.graphics.drawable {















  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {













    ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);















    method public void draw(android.graphics.Canvas);















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















    method public static float getExtraInsetFraction();

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -14594,6 +14594,7 @@ package android.graphics {













package android.graphics.drawable {





























  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {













    ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);















    method public void draw(android.graphics.Canvas);















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















    method public static float getExtraInsetFraction();

























api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -13856,6 +13856,7 @@ package android.graphics {













package android.graphics.drawable {





























  public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {













    ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);















    method public void draw(android.graphics.Canvas);















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















    method public static float getExtraInsetFraction();









@@ -13869,6 +13870,7 @@ package android.graphics.drawable {













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















    method public void setOpacity(int);















    method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);













    field public static final float MASK_SIZE = 100.0f;















  }





























  public abstract interface Animatable {

























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



+1
−1




























Original line number
Diff line number
Diff line








@@ -78,6 +78,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback













     * Mask path is defined inside device configuration in following dimension: [100 x 100]















     * @hide















     */













    @TestApi















    public static final float MASK_SIZE = 100f;































    /**










@@ -179,7 +180,6 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback













     *















     * @param backgroundDrawable drawable that should be rendered in the background















     * @param foregroundDrawable drawable that should be rendered in the foreground













     * @hide















     */















    public AdaptiveIconDrawable(Drawable backgroundDrawable,















            Drawable foregroundDrawable) {