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

Commit d6afaa85 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev am: 1e8f451b 

am: 090109cb

Change-Id: I688ef5dd83d10529e8669dfb9e5ea818e0fdc348
parents 74bfa119 090109cb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13834,6 +13834,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








@@ -14621,6 +14621,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








@@ -13876,6 +13876,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();









@@ -13889,6 +13890,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) {