summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeffrey Sharkey <>2009-03-24 18:11:49 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 18:11:49 -0700
commitd18299f1d84afb60fdf7bb5d8e31fa17bb70bb79 (patch)
treecaaead44e336ae0f5b75fc4f64926a48c1fd56c7 /src
parent9b141a29ba556452f97ecb96fc3014982388c44d (diff)
downloadandroid_packages_apps_Trebuchet-d18299f1d84afb60fdf7bb5d8e31fa17bb70bb79.tar.gz
android_packages_apps_Trebuchet-d18299f1d84afb60fdf7bb5d8e31fa17bb70bb79.tar.bz2
android_packages_apps_Trebuchet-d18299f1d84afb60fdf7bb5d8e31fa17bb70bb79.zip
Automated import from //branches/donutburger/...@140670,140670
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher/Launcher.java34
1 files changed, 18 insertions, 16 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 0346b228e..205703236 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -1350,25 +1350,27 @@ public final class Launcher extends Activity implements View.OnClickListener, On
private void bindAppWidgets(Launcher.DesktopBinder binder,
LinkedList<LauncherAppWidgetInfo> appWidgets) {
-
+
final Workspace workspace = mWorkspace;
final boolean desktopLocked = mDesktopLocked;
- final LauncherAppWidgetInfo item = appWidgets.removeFirst();
-
- final int appWidgetId = item.appWidgetId;
- final AppWidgetProviderInfo appWidgetInfo = mAppWidgetManager.getAppWidgetInfo(appWidgetId);
- item.hostView = mAppWidgetHost.createView(this, appWidgetId, appWidgetInfo);
-
- if (LOGD) d(LOG_TAG, String.format("about to setAppWidget for id=%d, info=%s", appWidgetId, appWidgetInfo));
-
- item.hostView.setAppWidget(appWidgetId, appWidgetInfo);
- item.hostView.setTag(item);
-
- workspace.addInScreen(item.hostView, item.screen, item.cellX,
- item.cellY, item.spanX, item.spanY, !desktopLocked);
-
- workspace.requestLayout();
+ if (!appWidgets.isEmpty()) {
+ final LauncherAppWidgetInfo item = appWidgets.removeFirst();
+
+ final int appWidgetId = item.appWidgetId;
+ final AppWidgetProviderInfo appWidgetInfo = mAppWidgetManager.getAppWidgetInfo(appWidgetId);
+ item.hostView = mAppWidgetHost.createView(this, appWidgetId, appWidgetInfo);
+
+ if (LOGD) d(LOG_TAG, String.format("about to setAppWidget for id=%d, info=%s", appWidgetId, appWidgetInfo));
+
+ item.hostView.setAppWidget(appWidgetId, appWidgetInfo);
+ item.hostView.setTag(item);
+
+ workspace.addInScreen(item.hostView, item.screen, item.cellX,
+ item.cellY, item.spanX, item.spanY, !desktopLocked);
+
+ workspace.requestLayout();
+ }
if (appWidgets.isEmpty()) {
if (PROFILE_ROTATE) {