mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 00:06:47 +00:00
Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)
Change-Id: If976ae8b3603e8bf42e8e857ce0b178d977b0a43
This commit is contained in:
@@ -110,8 +110,7 @@ public class BubbleTextView extends TextView {
|
||||
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
|
||||
|
||||
setCompoundDrawablesWithIntrinsicBounds(null,
|
||||
new FastBitmapDrawable(b),
|
||||
null, null);
|
||||
Utilities.createIconDrawable(b), null, null);
|
||||
setCompoundDrawablePadding((int) ((grid.folderIconSizePx - grid.iconSizePx) / 2f));
|
||||
setText(info.title);
|
||||
setTag(info);
|
||||
|
||||
@@ -533,7 +533,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
|
||||
final BubbleTextView textView =
|
||||
(BubbleTextView) mInflater.inflate(R.layout.application, this, false);
|
||||
textView.setCompoundDrawablesWithIntrinsicBounds(null,
|
||||
new FastBitmapDrawable(item.getIcon(mIconCache)), null, null);
|
||||
Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null);
|
||||
textView.setText(item.title);
|
||||
textView.setTag(item);
|
||||
textView.setTextColor(getResources().getColor(R.color.folder_items_text_color));
|
||||
|
||||
@@ -150,7 +150,7 @@ public class Hotseat extends FrameLayout {
|
||||
TextView allAppsButton = (TextView)
|
||||
inflater.inflate(R.layout.all_apps_button, mContent, false);
|
||||
Drawable d = context.getResources().getDrawable(R.drawable.all_apps_button_icon);
|
||||
d.setBounds(0, 0, Utilities.sIconTextureWidth, Utilities.sIconTextureHeight);
|
||||
Utilities.resizeIconDrawable(d);
|
||||
allAppsButton.setCompoundDrawables(null, d, null, null);
|
||||
|
||||
allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label));
|
||||
|
||||
@@ -69,7 +69,8 @@ public class PagedViewIcon extends TextView {
|
||||
PagedViewIcon.PressedCallback cb) {
|
||||
mIcon = info.iconBitmap;
|
||||
mPressedCallback = cb;
|
||||
setCompoundDrawablesWithIntrinsicBounds(null, new FastBitmapDrawable(mIcon), null, null);
|
||||
setCompoundDrawablesWithIntrinsicBounds(null, Utilities.createIconDrawable(mIcon),
|
||||
null, null);
|
||||
setText(info.title);
|
||||
setTag(info);
|
||||
}
|
||||
|
||||
@@ -65,6 +65,22 @@ final class Utilities {
|
||||
static int sColors[] = { 0xffff0000, 0xff00ff00, 0xff0000ff };
|
||||
static int sColorIndex = 0;
|
||||
|
||||
/**
|
||||
* Returns a FastBitmapDrawable with the icon, accurately sized.
|
||||
*/
|
||||
static Drawable createIconDrawable(Bitmap icon) {
|
||||
FastBitmapDrawable d = new FastBitmapDrawable(icon);
|
||||
resizeIconDrawable(d);
|
||||
return d;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resizes an icon drawable to the correct icon size.
|
||||
*/
|
||||
static void resizeIconDrawable(Drawable icon) {
|
||||
icon.setBounds(0, 0, sIconTextureWidth, sIconTextureHeight);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
|
||||
Reference in New Issue
Block a user