Fix for the dockbar items getting messed upon receiving a shortcut fr…

…om an intent. Closes #3.
AnderWeb · Jun 22, 2010 · 6511dbe · 6511dbe
1 parent 8788b9a
commit 6511dbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/org/adw/launcher/InstallShortcutReceiver.java b/src/org/adw/launcher/InstallShortcutReceiver.java
@@ -39,7 +39,8 @@ public void onReceive(Context context, Intent data) {
 
         if (!installShortcut(context, data, screen)) {
             // The target screen is full, let's try the other screens
-            for (int i = 0; i < Launcher.SCREEN_COUNT; i++) {
+        	final int count=Launcher.getScreenCount(context);
+            for (int i = 0; i < count; i++) {
                 if (i != screen && installShortcut(context, data, i)) break;
             }
         }

diff --git a/src/org/adw/launcher/Launcher.java b/src/org/adw/launcher/Launcher.java
@@ -1707,7 +1707,8 @@ private void bindDesktopItems(ArrayList<ItemInfo> shortcuts,
         for (int i = 0; i < count; i++) {
             ((ViewGroup) workspace.getChildAt(i)).removeAllViewsInLayout();
         }
-
+        final MiniLauncher miniLauncher=(MiniLauncher) mDragLayer.findViewById(R.id.mini_content);
+        miniLauncher.removeAllViewsInLayout();
         if (DEBUG_USER_INTERFACE) {
             android.widget.Button finishButton = new android.widget.Button(this);
             finishButton.setText("Finish");
@@ -3200,5 +3201,8 @@ private void realAddSearch(Widget info,final CellLayout.CellInfo cellInfo,final
         mWorkspace.addInCurrentScreen(view, xy[0], xy[1], spanX, spanY);
 
 	}
+	public static int getScreenCount(Context context){
+		return AlmostNexusSettingsHelper.getDesktopScreens(context);
+	}
 
 }