Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1e8f451bbf

Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83
This commit is contained in:
Hyunyoung Song
2017-05-01 23:28:48 +00:00
committed by android-build-merger
parent 6560d8845b 1e8f451bbf
commit 090109cb19
4 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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();

1
api/system-current.txt
View File

@@ -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();

2
api/test-current.txt
View File

@@ -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 {

2
graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
View File

@@ -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) {