diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-23 16:53:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-23 16:53:44 +0000 |
| commit | 24e0fc122186641adf862327d9266da774f3c25f (patch) | |
| tree | b2e5bd7a545ffe28abcd633e568382e48b89a66f /src/com/android | |
| parent | 09c7fc714448cd29faaec374ac9027ca878a3deb (diff) | |
| parent | fc0fe6b9be040122bc6047ef7f91b20fc8ead9cc (diff) | |
| download | android_packages_apps_Trebuchet-24e0fc122186641adf862327d9266da774f3c25f.tar.gz android_packages_apps_Trebuchet-24e0fc122186641adf862327d9266da774f3c25f.tar.bz2 android_packages_apps_Trebuchet-24e0fc122186641adf862327d9266da774f3c25f.zip | |
Merge "Deleting workspace items from db which have an invalid placement" into ub-now-queens
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 17670d25d..b04fc3fc2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1721,8 +1721,7 @@ public class LauncherModel extends BroadcastReceiver } // check & update map of what's occupied; used to discard overlapping/invalid items - private boolean checkItemPlacement(HashMap<Long, ItemInfo[][]> occupied, ItemInfo item, - AtomicBoolean deleteOnInvalidPlacement) { + private boolean checkItemPlacement(HashMap<Long, ItemInfo[][]> occupied, ItemInfo item) { LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); final int countX = (int) grid.numColumns; @@ -1733,7 +1732,6 @@ public class LauncherModel extends BroadcastReceiver // Return early if we detect that an item is under the hotseat button if (mCallbacks == null || mCallbacks.get().isAllAppsButtonRank((int) item.screenId)) { - deleteOnInvalidPlacement.set(true); Log.e(TAG, "Error loading shortcut into hotseat " + item + " into position (" + item.screenId + ":" + item.cellX + "," + item.cellY + ") occupied by all apps"); @@ -1930,7 +1928,6 @@ public class LauncherModel extends BroadcastReceiver UserHandleCompat user; while (!mStopped && c.moveToNext()) { - AtomicBoolean deleteOnInvalidPlacement = new AtomicBoolean(false); try { int itemType = c.getInt(itemTypeIndex); boolean restored = 0 != c.getInt(restoredIndex); @@ -2108,11 +2105,8 @@ public class LauncherModel extends BroadcastReceiver } // check & update map of what's occupied - deleteOnInvalidPlacement.set(false); - if (!checkItemPlacement(occupied, info, deleteOnInvalidPlacement)) { - if (deleteOnInvalidPlacement.get()) { - itemsToRemove.add(id); - } + if (!checkItemPlacement(occupied, info)) { + itemsToRemove.add(id); break; } @@ -2153,12 +2147,8 @@ public class LauncherModel extends BroadcastReceiver folderInfo.spanY = 1; // check & update map of what's occupied - deleteOnInvalidPlacement.set(false); - if (!checkItemPlacement(occupied, folderInfo, - deleteOnInvalidPlacement)) { - if (deleteOnInvalidPlacement.get()) { - itemsToRemove.add(id); - } + if (!checkItemPlacement(occupied, folderInfo)) { + itemsToRemove.add(id); break; } @@ -2266,12 +2256,8 @@ public class LauncherModel extends BroadcastReceiver appWidgetInfo.container = c.getInt(containerIndex); // check & update map of what's occupied - deleteOnInvalidPlacement.set(false); - if (!checkItemPlacement(occupied, appWidgetInfo, - deleteOnInvalidPlacement)) { - if (deleteOnInvalidPlacement.get()) { - itemsToRemove.add(id); - } + if (!checkItemPlacement(occupied, appWidgetInfo)) { + itemsToRemove.add(id); break; } |