am 06a1ff74: am 2fce90c3: Cleaning up icon resizing code (c86584b4) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/IconCache.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.graphics.Canvas;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.text.TextUtils;
		import android.util.Log;
		@@ -390,8 +389,7 @@ public class IconCache {
		entry.title = title;
		}
		if (icon != null) {
		entry.icon = Utilities.createIconBitmap(
		new BitmapDrawable(mContext.getResources(), icon), mContext);
		entry.icon = Utilities.createIconBitmap(icon, mContext);
		}
		}

src/com/android/launcher3/LauncherModel.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3544,8 +3544,8 @@ public class LauncherModel extends BroadcastReceiver
		boolean customIcon = false;
		ShortcutIconResource iconResource = null;

		if (bitmap != null && bitmap instanceof Bitmap) {
		icon = Utilities.createIconBitmap(new FastBitmapDrawable((Bitmap)bitmap), context);
		if (bitmap instanceof Bitmap) {
		icon = Utilities.createIconBitmap((Bitmap) bitmap, context);
		customIcon = true;
		} else {
		Parcelable extra = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);

src/com/android/launcher3/LauncherProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1050,7 +1050,7 @@ public class LauncherProvider extends ContentProvider {
		long id = c.getLong(idIndex);
		byte[] data = c.getBlob(iconIndex);
		try {
		Bitmap bitmap = Utilities.resampleIconBitmap(
		Bitmap bitmap = Utilities.createIconBitmap(
		BitmapFactory.decodeByteArray(data, 0, data.length),
		mContext);
		if (bitmap != null) {

src/com/android/launcher3/Utilities.java

+11 −50

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ public final class Utilities {

		private static int sIconWidth = -1;
		private static int sIconHeight = -1;
		public static int sIconTextureWidth = -1;
		public static int sIconTextureHeight = -1;

		private static final Rect sOldBounds = new Rect();
		private static final Canvas sCanvas = new Canvas();
		@@ -89,7 +87,7 @@ public final class Utilities {
		* Resizes an icon drawable to the correct icon size.
		*/
		static void resizeIconDrawable(Drawable icon) {
		icon.setBounds(0, 0, sIconTextureWidth, sIconTextureHeight);
		icon.setBounds(0, 0, sIconWidth, sIconHeight);
		}

		private static boolean isPropertyEnabled(String propertyName) {
		@@ -110,29 +108,18 @@ public final class Utilities {
		}

		/**
		* Returns a bitmap suitable for the all apps view. Used to convert pre-ICS
		* icon bitmaps that are stored in the database (which were 74x74 pixels at hdpi size)
		* to the proper size (48dp)
		* Returns a bitmap which is of the appropriate size to be displayed as an icon
		*/
		static Bitmap createIconBitmap(Bitmap icon, Context context) {
		int textureWidth = sIconTextureWidth;
		int textureHeight = sIconTextureHeight;
		int sourceWidth = icon.getWidth();
		int sourceHeight = icon.getHeight();
		if (sourceWidth > textureWidth && sourceHeight > textureHeight) {
		// Icon is bigger than it should be; clip it (solves the GB->ICS migration case)
		return Bitmap.createBitmap(icon,
		(sourceWidth - textureWidth) / 2,
		(sourceHeight - textureHeight) / 2,
		textureWidth, textureHeight);
		} else if (sourceWidth == textureWidth && sourceHeight == textureHeight) {
		// Icon is the right size, no need to change it
		synchronized (sCanvas) { // we share the statics :-(
		if (sIconWidth == -1) {
		initStatics(context);
		}
		}
		if (sIconWidth == icon.getWidth() && sIconHeight == icon.getHeight()) {
		return icon;
		} else {
		// Icon is too small, render to a larger bitmap
		final Resources resources = context.getResources();
		return createIconBitmap(new BitmapDrawable(resources, icon), context);
		}
		return createIconBitmap(new BitmapDrawable(context.getResources(), icon), context);
		}

		/**
		@@ -172,8 +159,8 @@ public final class Utilities {
		}

		// no intrinsic size --> use default size
		int textureWidth = sIconTextureWidth;
		int textureHeight = sIconTextureHeight;
		int textureWidth = sIconWidth;
		int textureHeight = sIconHeight;

		final Bitmap bitmap = Bitmap.createBitmap(textureWidth, textureHeight,
		Bitmap.Config.ARGB_8888);
		@@ -204,30 +191,6 @@ public final class Utilities {
		}
		}

		/**
		* Returns a Bitmap representing the thumbnail of the specified Bitmap.
		*
		* @param bitmap The bitmap to get a thumbnail of.
		* @param context The application's context.
		*
		* @return A thumbnail for the specified bitmap or the bitmap itself if the
		* thumbnail could not be created.
		*/
		static Bitmap resampleIconBitmap(Bitmap bitmap, Context context) {
		synchronized (sCanvas) { // we share the statics :-(
		if (sIconWidth == -1) {
		initStatics(context);
		}

		if (bitmap.getWidth() == sIconWidth && bitmap.getHeight() == sIconHeight) {
		return bitmap;
		} else {
		final Resources resources = context.getResources();
		return createIconBitmap(new BitmapDrawable(resources, bitmap), context);
		}
		}
		}

		/**
		* Given a coordinate relative to the descendant, find the coordinate in a parent view's
		* coordinates.
		@@ -330,12 +293,10 @@ public final class Utilities {
		private static void initStatics(Context context) {
		final Resources resources = context.getResources();
		sIconWidth = sIconHeight = (int) resources.getDimension(R.dimen.app_icon_size);
		sIconTextureWidth = sIconTextureHeight = sIconWidth;
		}

		public static void setIconSize(int widthPx) {
		sIconWidth = sIconHeight = widthPx;
		sIconTextureWidth = sIconTextureHeight = widthPx;
		}

		public static void scaleRect(Rect r, float scale) {