From d2afdab226dcff7cfc3fb26ef0a7030edb17b925 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Wed, 26 Apr 2017 10:41:28 -0700
Subject: [PATCH] Add @TestApi annotation to AdaptiveIconDrawable

Bug: 37779858
Bug: 37788590

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

Change-Id: I459317e8b9f6db227a4bb567c17b212639454e9d
---
 api/current.txt                                                 | 1 +
 api/system-current.txt                                          | 1 +
 api/test-current.txt                                            | 2 ++
 .../java/android/graphics/drawable/AdaptiveIconDrawable.java    | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 5b7f457abb8b0..20873c6f0b380 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13836,6 +13836,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();
diff --git a/api/system-current.txt b/api/system-current.txt
index 921a97dfa8f1e..f9a2f34aa063e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -14611,6 +14611,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();
diff --git a/api/test-current.txt b/api/test-current.txt
index 75ddd8d2b63d4..666b78a6240a4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -13878,6 +13878,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();
@@ -13891,6 +13892,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 {
diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
index ffadad9d68c53..ab10e978b0f7a 100644
--- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
+++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
@@ -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) {