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

Commit d2afdab2 authored Apr 26, 2017 by Hyunyoung Song

Add @TestApi annotation to AdaptiveIconDrawable

Bug: 37779858
Bug: 37788590

Test: $ make -j31
Test: $ make update-api -j31

Change-Id: I459317e8b9f6db227a4bb567c17b212639454e9d

parent 1c661d19

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13836,6 +13836,7 @@ package android.graphics {
	package android.graphics.drawable {		package android.graphics.drawable {

	public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {		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 void draw(android.graphics.Canvas);
	method public android.graphics.drawable.Drawable getBackground();		method public android.graphics.drawable.Drawable getBackground();
	method public static float getExtraInsetFraction();		method public static float getExtraInsetFraction();

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14611,6 +14611,7 @@ package android.graphics {
	package android.graphics.drawable {		package android.graphics.drawable {

	public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {		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 void draw(android.graphics.Canvas);
	method public android.graphics.drawable.Drawable getBackground();		method public android.graphics.drawable.Drawable getBackground();
	method public static float getExtraInsetFraction();		method public static float getExtraInsetFraction();

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13878,6 +13878,7 @@ package android.graphics {
	package android.graphics.drawable {		package android.graphics.drawable {

	public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {		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 void draw(android.graphics.Canvas);
	method public android.graphics.drawable.Drawable getBackground();		method public android.graphics.drawable.Drawable getBackground();
	method public static float getExtraInsetFraction();		method public static float getExtraInsetFraction();
	@@ -13891,6 +13892,7 @@ package android.graphics.drawable {
	method public void setColorFilter(android.graphics.ColorFilter);		method public void setColorFilter(android.graphics.ColorFilter);
	method public void setOpacity(int);		method public void setOpacity(int);
	method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);		method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
			field public static final float MASK_SIZE = 100.0f;
	}		}

	public abstract interface Animatable {		public abstract interface Animatable {

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

+1 −1

Original line number	Original line	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]		* Mask path is defined inside device configuration in following dimension: [100 x 100]
	* @hide		* @hide
	*/		*/
			@TestApi
	public static final float MASK_SIZE = 100f;		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 backgroundDrawable drawable that should be rendered in the background
	* @param foregroundDrawable drawable that should be rendered in the foreground		* @param foregroundDrawable drawable that should be rendered in the foreground
	* @hide
	*/		*/
	public AdaptiveIconDrawable(Drawable backgroundDrawable,		public AdaptiveIconDrawable(Drawable backgroundDrawable,
	Drawable foregroundDrawable) {		Drawable foregroundDrawable) {