Trebuchet : Default workspace improvements

Ported from cm-10.2

Adds support for fallback in default_workspace

Change-Id: I2590ae2d5e3c1b6124061581b9ffa206d611c608

1 files changed, 34 insertions, 1 deletions

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 2ff612ff3..210bbf8bc 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -59,7 +59,9 @@ import org.xmlpull.v1.XmlPullParserException;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class LauncherProvider extends ContentProvider {
     private static final String TAG = "Launcher.LauncherProvider";
@@ -1034,6 +1036,10 @@ public class LauncherProvider extends ContentProvider {
 
                 final int depth = parser.getDepth();
 
+                final HashMap<Long, ItemInfo[][]> occupied = new HashMap<Long, ItemInfo[][]>();
+                LauncherModel model = LauncherAppState.getInstance().getModel();
+                AtomicBoolean deleteItem = new AtomicBoolean();
+
                 int type;
                 while (((type = parser.next()) != XmlPullParser.END_TAG ||
                         parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) {
@@ -1086,6 +1092,18 @@ public class LauncherProvider extends ContentProvider {
                     values.put(LauncherSettings.Favorites.CELLX, x);
                     values.put(LauncherSettings.Favorites.CELLY, y);
 
+                    ItemInfo info = new ItemInfo();
+                    info.container = container;
+                    info.spanX = a.getInt(R.styleable.Favorite_spanX, 1);
+                    info.spanY = a.getInt(R.styleable.Favorite_spanY, 1);
+                    info.cellX = a.getInt(R.styleable.Favorite_x, 0);
+                    info.cellY = a.getInt(R.styleable.Favorite_y, 0);
+                    info.screenId = a.getInt(R.styleable.Favorite_screen, 0);
+
+                    if (!model.checkItemPlacement(occupied, info, deleteItem)) {
+                        continue;
+                    }
+
                     if (LOGD) {
                         final String title = a.getString(R.styleable.Favorite_title);
                         final String pkg = a.getString(R.styleable.Favorite_packageName);
@@ -1172,7 +1190,22 @@ public class LauncherProvider extends ContentProvider {
                             added = false;
                         }
                     }
-                    if (added) i++;
+                    if (added) {
+                        i++;
+                    } else {
+                        long containerIndex = info.screenId;
+                        if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+                            occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT)
+                            [(int) info.screenId][0] = null;
+                        } else {
+                            ItemInfo[][] screens = occupied.get(info.screenId);
+                            for (int gridX = info.cellX; gridX < (info.cellX+info.spanX); gridX++) {
+                                for (int gridY = info.cellY; gridY < (info.cellY+info.spanY); gridY++) {
+                                    screens[gridX][gridY] = null;
+                                }
+                            }
+                        }
+                    }
                     a.recycle();
                 }
             } catch (XmlPullParserException e) {