diff options
author | Michael Jurka <mikejurka@google.com> | 2011-01-17 16:11:21 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-01-17 16:58:16 -0800 |
commit | 4ad24ba3c726bb9021d887c4c2300d345151ab0d (patch) | |
tree | 344bfe609bc74178f6ee09667375e7b82c958359 /src/com/android/launcher2/CellLayout.java | |
parent | 4a7d4afe87a9146b3cefef8e00581090301b698d (diff) | |
download | android_packages_apps_Trebuchet-4ad24ba3c726bb9021d887c4c2300d345151ab0d.tar.gz android_packages_apps_Trebuchet-4ad24ba3c726bb9021d887c4c2300d345151ab0d.tar.bz2 android_packages_apps_Trebuchet-4ad24ba3c726bb9021d887c4c2300d345151ab0d.zip |
removed some more unnecessary code
- delete unnecessary call to get WallpaperManager
- remove two unused methods
Diffstat (limited to 'src/com/android/launcher2/CellLayout.java')
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index cf82abb9d..af2f984b4 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -797,18 +797,6 @@ public class CellLayout extends ViewGroup implements Dimmable, VisibilityChanged } /** - * Check if the row 'y' is empty from columns 'left' to 'right', inclusive. - */ - private static boolean isRowEmpty(int y, int left, int right, boolean[][] occupied) { - for (int x = left; x <= right; x++) { - if (occupied[x][y]) { - return false; - } - } - return true; - } - - /** * Given a point, return the cell that strictly encloses that point * @param x X coordinate of the point * @param y Y coordinate of the point @@ -1042,24 +1030,6 @@ public class CellLayout extends ViewGroup implements Dimmable, VisibilityChanged } } - private boolean isVacantIgnoring( - int originX, int originY, int spanX, int spanY, View ignoreView) { - if (ignoreView != null) { - markCellsAsUnoccupiedForView(ignoreView); - } - boolean isVacant = true; - for (int i = 0; i < spanY; i++) { - if (!isRowEmpty(originY + i, originX, originX + spanX - 1, mOccupied)) { - isVacant = false; - break; - } - } - if (ignoreView != null) { - markCellsAsOccupiedForView(ignoreView); - } - return isVacant; - } - public View getChildAt(int x, int y) { final int count = getChildCount(); for (int i = 0; i < count; i++) { |