diff options
| author | Dan Sandler <dsandler@android.com> | 2015-05-15 04:39:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 04:39:42 +0000 |
| commit | aee0c2ce39fe92716bb76d33d6f8cc8789467cf6 (patch) | |
| tree | 45267d7c194cf57499388ca50a1886ffdbb1ef70 /api | |
| parent | af9ea2cf5e9f4848b3d1078cc261931e1339e7cf (diff) | |
| parent | 02cd9f91a6bd6d06d6d1237f8b978a0ab0b8ea32 (diff) | |
| download | frameworks_base-aee0c2ce39fe92716bb76d33d6f8cc8789467cf6.zip frameworks_base-aee0c2ce39fe92716bb76d33d6f8cc8789467cf6.tar.gz frameworks_base-aee0c2ce39fe92716bb76d33d6f8cc8789467cf6.tar.bz2 | |
Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 2a36e88..bb2f4e6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12404,7 +12404,7 @@ package android.graphics.drawable { method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri); method public static android.graphics.drawable.Icon createWithData(byte[], int, int); method public static android.graphics.drawable.Icon createWithFilePath(java.lang.String); - method public static android.graphics.drawable.Icon createWithResource(android.content.res.Resources, int); + method public static android.graphics.drawable.Icon createWithResource(android.content.Context, int); method public static android.graphics.drawable.Icon createWithResource(java.lang.String, int); method public int describeContents(); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); diff --git a/api/system-current.txt b/api/system-current.txt index 4044e61..17045f8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12713,7 +12713,7 @@ package android.graphics.drawable { method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri); method public static android.graphics.drawable.Icon createWithData(byte[], int, int); method public static android.graphics.drawable.Icon createWithFilePath(java.lang.String); - method public static android.graphics.drawable.Icon createWithResource(android.content.res.Resources, int); + method public static android.graphics.drawable.Icon createWithResource(android.content.Context, int); method public static android.graphics.drawable.Icon createWithResource(java.lang.String, int); method public int describeContents(); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); |