diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-09 10:43:58 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-13 10:31:12 -0800 |
| commit | 1cd01b023acc123b771765b7297d8aaedac224e0 (patch) | |
| tree | 9f275f4cbf290c7fb7e67a913bba14079abcd982 /src/com/android/launcher3/folder | |
| parent | 824c540f1911101321ebe7f05cb0885a4922e363 (diff) | |
| download | android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.gz android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.bz2 android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.zip | |
Ensuring that ShortcutInfo always has an icon
> Making iconBitmap public instead of a getter (similar to AppInfo)
> Removing getIcon() which can lead to IO on UI thread
> Removing updateIcon and handling the update at the caller
Bug: 21325319
Change-Id: I6a49b9043f974e9629ea25e77012d97cc04c0594
Diffstat (limited to 'src/com/android/launcher3/folder')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/folder/FolderPagedView.java | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 37453232b..973245b92 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -146,7 +146,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { } public static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group, - FolderInfo folderInfo, IconCache iconCache) { + FolderInfo folderInfo) { @SuppressWarnings("all") // suppress dead code warning final boolean error = INITIAL_ITEM_ANIMATION_DURATION >= DROP_IN_ANIMATION_DURATION; if (error) { diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index 8aaeb9e37..3a318b58f 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -31,7 +31,6 @@ import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener; -import com.android.launcher3.IconCache; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; @@ -73,7 +72,6 @@ public class FolderPagedView extends PagedView { public final boolean mIsRtl; private final LayoutInflater mInflater; - private final IconCache mIconCache; private final ViewGroupFocusHelper mFocusIndicatorHelper; @Thunk final HashMap<View, Runnable> mPendingAnimations = new HashMap<>(); @@ -107,7 +105,6 @@ public class FolderPagedView extends PagedView { mMaxItemsPerPage = mMaxCountX * mMaxCountY; mInflater = LayoutInflater.from(context); - mIconCache = app.getIconCache(); mIsRtl = Utilities.isRtl(getResources()); setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES); @@ -231,7 +228,7 @@ public class FolderPagedView extends PagedView { public View createNewView(ShortcutInfo item) { final BubbleTextView textView = (BubbleTextView) mInflater.inflate( R.layout.folder_application, null, false); - textView.applyFromShortcutInfo(item, mIconCache); + textView.applyFromShortcutInfo(item); textView.setOnClickListener(mFolder); textView.setOnLongClickListener(mFolder); textView.setOnFocusChangeListener(mFocusIndicatorHelper); |