diff options
author | Michael Jurka <mikejurka@google.com> | 2011-08-29 14:03:34 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-09-07 16:59:07 -0700 |
commit | c9d95c5897fc5ebbf53903d4ab18ad13d196f643 (patch) | |
tree | 86af38c22deec7c93b6434d2e04ec1a2e923b6dc /src/com/android/launcher2/AppsCustomizePagedView.java | |
parent | 6c6f6f2009337ebfcc7f8fa3e5651d070ee2a9d7 (diff) | |
download | android_packages_apps_Trebuchet-c9d95c5897fc5ebbf53903d4ab18ad13d196f643.tar.gz android_packages_apps_Trebuchet-c9d95c5897fc5ebbf53903d4ab18ad13d196f643.tar.bz2 android_packages_apps_Trebuchet-c9d95c5897fc5ebbf53903d4ab18ad13d196f643.zip |
Cleaning up LauncherModel
- performing all DB operations immediately if called from worker thread (a previous change that did this in updateItemInDatabase fixed an outstanding bug)
- centralizing logic to do database updates
- removing old logging code
Change-Id: Idc7bfef3921828ff7c5492b8e996c0a07e1ec508
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizePagedView.java')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index d3e096300..878cc272e 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1014,8 +1014,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (rawInfo instanceof AppWidgetProviderInfo) { // Fill in the widget information AppWidgetProviderInfo info = (AppWidgetProviderInfo) rawInfo; - createItemInfo = new PendingAddWidgetInfo(info, null, null, "13"); - int[] cellSpans = mLauncher.getSpanForWidget(info, null); + createItemInfo = new PendingAddWidgetInfo(info, null, null); + int[] cellSpans = CellLayout.rectToCell(getResources(), + info.minWidth, info.minHeight, null); FastBitmapDrawable preview = new FastBitmapDrawable(data.generatedImages.get(i)); widget.applyFromAppWidgetProviderInfo(info, preview, -1, cellSpans, mHolographicOutlineHelper); @@ -1023,7 +1024,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } else if (rawInfo instanceof ResolveInfo) { // Fill in the shortcuts information ResolveInfo info = (ResolveInfo) rawInfo; - createItemInfo = new PendingAddItemInfo("14"); + createItemInfo = new PendingAddItemInfo(); createItemInfo.itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; createItemInfo.componentName = new ComponentName(info.activityInfo.packageName, info.activityInfo.name); |