commit 801ca190c6df56bdf67ebd0a320ab5912640db10
author Sunny Goyal <sunnygoyal@google.com> Wed Mar 08 09:19:46 2017 -0800
committer Sunny Goyal <sunnygoyal@google.com> Thu Mar 30 12:42:47 2017 -0700
tree a224116006d05a84d4dc7cb1e78352c3290de32b
parent 13dc73d73cafc6dc84edd5eb85d40647bfa161ec

Adding support for Icon and related APIs
Updating ShortcutManagerCompat to supprot IconCompat

Bug: 35845001
Test: Existing tests pass. Added new tests.
Change-Id: I8be2d73dec00aee860e2a854942a69e72af1954a

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d217456..f63822f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6411,8 +6411,9 @@
     method public android.support.v4.content.pm.ShortcutInfoCompat build();
     method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setActivity(android.content.ComponentName);
     method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setDisabledMessage(java.lang.CharSequence);
-    method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setIcon(android.graphics.Bitmap);
-    method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setIcon(int);
+    method public deprecated android.support.v4.content.pm.ShortcutInfoCompat.Builder setIcon(android.graphics.Bitmap);
+    method public deprecated android.support.v4.content.pm.ShortcutInfoCompat.Builder setIcon(int);
+    method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setIcon(android.support.v4.graphics.drawable.IconCompat);
     method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setIntent(android.content.Intent);
     method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setIntents(android.content.Intent[]);
     method public android.support.v4.content.pm.ShortcutInfoCompat.Builder setLongLabel(java.lang.CharSequence);
@@ -6514,6 +6515,15 @@
     method public static android.graphics.drawable.Drawable wrap(android.graphics.drawable.Drawable);
   }
 
+  public class IconCompat {
+    method public static android.support.v4.graphics.drawable.IconCompat createWithAdaptiveBitmap(android.graphics.Bitmap);
+    method public static android.support.v4.graphics.drawable.IconCompat createWithBitmap(android.graphics.Bitmap);
+    method public static android.support.v4.graphics.drawable.IconCompat createWithContentUri(java.lang.String);
+    method public static android.support.v4.graphics.drawable.IconCompat createWithContentUri(android.net.Uri);
+    method public static android.support.v4.graphics.drawable.IconCompat createWithData(byte[], int, int);
+    method public static android.support.v4.graphics.drawable.IconCompat createWithResource(android.content.Context, int);
+  }
+
   public abstract class RoundedBitmapDrawable extends android.graphics.drawable.Drawable {
     method public void draw(android.graphics.Canvas);
     method public final android.graphics.Bitmap getBitmap();