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

Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev

Browse Source
This commit is contained in:
Dan Sandler
2015-05-15 04:39:41 +00:00
committed by Android (Google) Code Review
parent af9ea2cf5e 02cd9f91a6
commit aee0c2ce39
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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 createWithContentUri(android.net.Uri);
method public static android.graphics.drawable.Icon createWithData(byte[], int, int); 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 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 static android.graphics.drawable.Icon createWithResource(java.lang.String, int);
method public int describeContents(); method public int describeContents();
method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context);

2
api/system-current.txt
View File

@@ -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 createWithContentUri(android.net.Uri);
method public static android.graphics.drawable.Icon createWithData(byte[], int, int); 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 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 static android.graphics.drawable.Icon createWithResource(java.lang.String, int);
method public int describeContents(); method public int describeContents();
method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context);

15
graphics/java/android/graphics/drawable/Icon.java
View File

@@ -353,15 +353,26 @@ public final class Icon implements Parcelable {
/** /**
* Create an Icon pointing to a drawable resource. * Create an Icon pointing to a drawable resource.
* @param res Resources for a package containing the resource in question * @param context The context for the application whose resources should be used to resolve the
* given resource ID.
* @param resId ID of the drawable resource * @param resId ID of the drawable resource
*/ */
public static Icon createWithResource(Context context, @DrawableRes int resId) {
final Icon rep = new Icon(TYPE_RESOURCE);
rep.mInt1 = resId;
rep.mString1 = context.getPackageName();
return rep;
}
/**
* Version of createWithResource that takes Resources. Do not use.
* @hide
*/
public static Icon createWithResource(Resources res, @DrawableRes int resId) { public static Icon createWithResource(Resources res, @DrawableRes int resId) {
if (res == null) { if (res == null) {
throw new IllegalArgumentException("Resource must not be null."); throw new IllegalArgumentException("Resource must not be null.");
} }
final Icon rep = new Icon(TYPE_RESOURCE); final Icon rep = new Icon(TYPE_RESOURCE);
rep.mObj1 = res;
rep.mInt1 = resId; rep.mInt1 = resId;
rep.mString1 = res.getResourcePackageName(resId); rep.mString1 = res.getResourcePackageName(resId);
return rep; return rep;

5
graphics/tests/graphicstests/src/android/graphics/drawable/IconTest.java
View File

@@ -112,8 +112,7 @@ public class IconTest extends AndroidTestCase {
final Bitmap res1 = ((BitmapDrawable) getContext().getDrawable(R.drawable.landscape)) final Bitmap res1 = ((BitmapDrawable) getContext().getDrawable(R.drawable.landscape))
.getBitmap(); .getBitmap();
final Icon im1 = Icon.createWithResource(getContext().getResources(), final Icon im1 = Icon.createWithResource(getContext(), R.drawable.landscape);
R.drawable.landscape);
final Drawable draw1 = im1.loadDrawable(mContext); final Drawable draw1 = im1.loadDrawable(mContext);
final Bitmap test1 = Bitmap.createBitmap(draw1.getIntrinsicWidth(), final Bitmap test1 = Bitmap.createBitmap(draw1.getIntrinsicWidth(),
draw1.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); draw1.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
@@ -223,7 +222,7 @@ public class IconTest extends AndroidTestCase {
imgs.add(bit1); imgs.add(bit1);
final Icon data1 = Icon.createWithData(pngdata, 0, pngdata.length); final Icon data1 = Icon.createWithData(pngdata, 0, pngdata.length);
imgs.add(data1); imgs.add(data1);
final Icon res1 = Icon.createWithResource(getContext().getResources(), R.drawable.landscape); final Icon res1 = Icon.createWithResource(getContext(), R.drawable.landscape);
imgs.add(res1); imgs.add(res1);
ArrayList<Icon> test = new ArrayList<>(); ArrayList<Icon> test = new ArrayList<>();