Ensuring that we are calling setCompoundDrawable() instead of using intrinsic bounds. (Bug 11203738)
Change-Id: Ic2100e4008d7fc95d2670aab9d3b46a96a927599
This commit is contained in:
@@ -109,7 +109,7 @@ public class BubbleTextView extends TextView {
|
||||
LauncherAppState app = LauncherAppState.getInstance();
|
||||
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
|
||||
|
||||
setCompoundDrawablesWithIntrinsicBounds(null,
|
||||
setCompoundDrawables(null,
|
||||
Utilities.createIconDrawable(b), null, null);
|
||||
setCompoundDrawablePadding((int) ((grid.folderIconSizePx - grid.iconSizePx) / 2f));
|
||||
setText(info.title);
|
||||
|
||||
@@ -532,7 +532,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
|
||||
protected boolean createAndAddShortcut(ShortcutInfo item) {
|
||||
final BubbleTextView textView =
|
||||
(BubbleTextView) mInflater.inflate(R.layout.application, this, false);
|
||||
textView.setCompoundDrawablesWithIntrinsicBounds(null,
|
||||
textView.setCompoundDrawables(null,
|
||||
Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null);
|
||||
textView.setText(item.title);
|
||||
textView.setTag(item);
|
||||
|
||||
@@ -69,7 +69,7 @@ public class PagedViewIcon extends TextView {
|
||||
PagedViewIcon.PressedCallback cb) {
|
||||
mIcon = info.iconBitmap;
|
||||
mPressedCallback = cb;
|
||||
setCompoundDrawablesWithIntrinsicBounds(null, Utilities.createIconDrawable(mIcon),
|
||||
setCompoundDrawables(null, Utilities.createIconDrawable(mIcon),
|
||||
null, null);
|
||||
setText(info.title);
|
||||
setTag(info);
|
||||
|
||||
@@ -70,6 +70,7 @@ final class Utilities {
|
||||
*/
|
||||
static Drawable createIconDrawable(Bitmap icon) {
|
||||
FastBitmapDrawable d = new FastBitmapDrawable(icon);
|
||||
d.setFilterBitmap(true);
|
||||
resizeIconDrawable(d);
|
||||
return d;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user