diff options
| author | Winson Chung <winsonc@google.com> | 2013-10-14 16:29:29 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-10-14 16:30:38 -0700 |
| commit | 540004905a555087e72691aad4479aa52ab5460e (patch) | |
| tree | 8d2b8b8ca0feedcb08074a6ca6ee9183dc72c3e4 /src | |
| parent | 2ac85a6d3e1096b50f00f4236ae059bcdaecb761 (diff) | |
| download | android_packages_apps_Trebuchet-540004905a555087e72691aad4479aa52ab5460e.tar.gz android_packages_apps_Trebuchet-540004905a555087e72691aad4479aa52ab5460e.tar.bz2 android_packages_apps_Trebuchet-540004905a555087e72691aad4479aa52ab5460e.zip | |
Ensuring that we are calling setCompoundDrawable() instead of using intrinsic bounds. (Bug 11203738)
Change-Id: Ic2100e4008d7fc95d2670aab9d3b46a96a927599
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/PagedViewIcon.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index eb65a0a9c..8dab9432a 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -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); diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index ce2edbed2..69d9a3d4b 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -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); diff --git a/src/com/android/launcher3/PagedViewIcon.java b/src/com/android/launcher3/PagedViewIcon.java index 561215721..8bfe42d24 100644 --- a/src/com/android/launcher3/PagedViewIcon.java +++ b/src/com/android/launcher3/PagedViewIcon.java @@ -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); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index fe8655029..21c546d04 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -70,6 +70,7 @@ final class Utilities { */ static Drawable createIconDrawable(Bitmap icon) { FastBitmapDrawable d = new FastBitmapDrawable(icon); + d.setFilterBitmap(true); resizeIconDrawable(d); return d; } |