diff options
author | Winson Chung <winsonc@google.com> | 2010-06-11 17:34:16 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2010-06-30 16:24:40 -0700 |
commit | aafa03cbb925c74be1c13f8bb99d928be429e62f (patch) | |
tree | 7d63432c1439f2249b506eeb7109d40e947a037f /src/com/android/launcher2/InstallShortcutReceiver.java | |
parent | 6404116682ff30f9e2170c68a1b56dfa7c6836cc (diff) | |
download | android_packages_apps_Trebuchet-aafa03cbb925c74be1c13f8bb99d928be429e62f.tar.gz android_packages_apps_Trebuchet-aafa03cbb925c74be1c13f8bb99d928be429e62f.tar.bz2 android_packages_apps_Trebuchet-aafa03cbb925c74be1c13f8bb99d928be429e62f.zip |
Allow for NxM layout and in-place rotation of items on homescreen.
Currently, rotation is disabled as designs are still in flux, but the NxM grid is enabled (8x4).
Change-Id: I0026f88c674719e3d67de6d6d481d2d4cd606362
Diffstat (limited to 'src/com/android/launcher2/InstallShortcutReceiver.java')
-rw-r--r-- | src/com/android/launcher2/InstallShortcutReceiver.java | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java index 3fc568b9f..36380540d 100644 --- a/src/com/android/launcher2/InstallShortcutReceiver.java +++ b/src/com/android/launcher2/InstallShortcutReceiver.java @@ -16,11 +16,11 @@ package com.android.launcher2; +import java.util.ArrayList; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.ContentResolver; -import android.database.Cursor; import android.widget.Toast; import com.android.launcher.R; @@ -86,38 +86,24 @@ public class InstallShortcutReceiver extends BroadcastReceiver { private static boolean findEmptyCell(Context context, int[] xy, int screen) { final int xCount = Launcher.NUMBER_CELLS_X; final int yCount = Launcher.NUMBER_CELLS_Y; - boolean[][] occupied = new boolean[xCount][yCount]; - final ContentResolver cr = context.getContentResolver(); - Cursor c = cr.query(LauncherSettings.Favorites.CONTENT_URI, - new String[] { LauncherSettings.Favorites.CELLX, LauncherSettings.Favorites.CELLY, - LauncherSettings.Favorites.SPANX, LauncherSettings.Favorites.SPANY }, - LauncherSettings.Favorites.SCREEN + "=?", - new String[] { String.valueOf(screen) }, null); - - final int cellXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLX); - final int cellYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.CELLY); - final int spanXIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SPANX); - final int spanYIndex = c.getColumnIndexOrThrow(LauncherSettings.Favorites.SPANY); - - try { - while (c.moveToNext()) { - int cellX = c.getInt(cellXIndex); - int cellY = c.getInt(cellYIndex); - int spanX = c.getInt(spanXIndex); - int spanY = c.getInt(spanYIndex); - + ArrayList<ItemInfo> items = LauncherModel.getItemsInLocalCoordinates(context); + ItemInfo item = null; + int cellX, cellY, spanX, spanY; + for (int i = 0; i < items.size(); ++i) { + item = items.get(i); + if (item.screen == screen) { + cellX = item.cellX; + cellY = item.cellY; + spanX = item.spanX; + spanY = item.spanY; for (int x = cellX; x < cellX + spanX && x < xCount; x++) { for (int y = cellY; y < cellY + spanY && y < yCount; y++) { occupied[x][y] = true; } } } - } catch (Exception e) { - return false; - } finally { - c.close(); } return CellLayout.findVacantCell(xy, 1, 1, xCount, yCount, occupied); |