diff options
author | Michael Jurka <mikejurka@google.com> | 2010-08-13 11:27:44 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-08-13 11:59:51 -0700 |
commit | c28de51eedb26848abf9245ddd19e021d30be318 (patch) | |
tree | a7312ab9a41511f51408c7eddc1da384e6b47776 /src/com/android/launcher2/Launcher.java | |
parent | 4dfd261e5083ecafc31b884a699351a58518bccc (diff) | |
download | android_packages_apps_Trebuchet-c28de51eedb26848abf9245ddd19e021d30be318.tar.gz android_packages_apps_Trebuchet-c28de51eedb26848abf9245ddd19e021d30be318.tar.bz2 android_packages_apps_Trebuchet-c28de51eedb26848abf9245ddd19e021d30be318.zip |
fixed crash in addVacantCell
No longer precalculating vacant cells
The previous way of finding empty cells for
widgets/icons etc. precalculated all the possible
empty spaces. Now that we have an 8x7 grid in
tablet, there are too many possible empty spaces.
Change-Id: Ib39113fdf755935bfad257843e1618c680ed9e72
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index d7ce6f26c..ccd6f6553 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -722,7 +722,7 @@ public final class Launcher extends Activity addItemCellInfo.cellY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_CELL_Y); addItemCellInfo.spanX = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_X); addItemCellInfo.spanY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_Y); - addItemCellInfo.findVacantCellsFromOccupied( + addItemCellInfo.updateOccupiedCells( savedState.getBooleanArray(RUNTIME_STATE_PENDING_ADD_OCCUPIED_CELLS), savedState.getInt(RUNTIME_STATE_PENDING_ADD_COUNT_X), savedState.getInt(RUNTIME_STATE_PENDING_ADD_COUNT_Y)); @@ -1229,7 +1229,7 @@ public final class Launcher extends Activity // Disable add if the workspace is full. if (visible) { - mMenuAddInfo = mWorkspace.findAllVacantCells(null); + mMenuAddInfo = mWorkspace.updateOccupiedCells(null); menu.setGroupEnabled(MENU_GROUP_ADD, mMenuAddInfo != null && mMenuAddInfo.valid); } @@ -1239,7 +1239,7 @@ public final class Launcher extends Activity // we need to initialize mAddItemCellInfo before adding something to the homescreen -- when // using the settings menu to add an item, something similar happens in showAddDialog public void prepareAddItemFromHomeCustomizationDrawer() { - mMenuAddInfo = mWorkspace.findAllVacantCells(null); + mMenuAddInfo = mWorkspace.updateOccupiedCells(null); mAddItemCellInfo = mMenuAddInfo; } @@ -1447,7 +1447,7 @@ public final class Launcher extends Activity if (!cellInfo.findCellForSpan(xy, spanX, spanY)) { boolean[] occupied = mSavedState != null ? mSavedState.getBooleanArray(RUNTIME_STATE_PENDING_ADD_OCCUPIED_CELLS) : null; - cellInfo = mWorkspace.findAllVacantCells(occupied); + cellInfo = mWorkspace.updateOccupiedCells(occupied); if (!cellInfo.findCellForSpan(xy, spanX, spanY)) { Toast.makeText(this, getString(R.string.out_of_space), Toast.LENGTH_SHORT).show(); return false; |