diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-26 16:05:17 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-05-27 18:23:29 -0700 |
| commit | da4fe1a6244457f144e0a331cada3ada17157809 (patch) | |
| tree | 71a921324999c5c61598d08b1de864c426c8bc8e /src/com/android/launcher3/util | |
| parent | c54c701a94e213503d0c6d2ff414e91a50c14133 (diff) | |
| download | android_packages_apps_Trebuchet-da4fe1a6244457f144e0a331cada3ada17157809.tar.gz android_packages_apps_Trebuchet-da4fe1a6244457f144e0a331cada3ada17157809.tar.bz2 android_packages_apps_Trebuchet-da4fe1a6244457f144e0a331cada3ada17157809.zip | |
Moving the QSB to the workspace grid.
The QSB will only be resent on the first screen of the workspace
covering the full width of the first row. If will not be movable.
The first screen of the workspace will not be movable.
The searchDropTargetBar no longer contains the QSB (it can be
renamed in aseparate cl).
Refactoring all QSB related logic by moving it to a custom view
inflated only using xml.
Change-Id: Icb4fd6eb855df1af15f685961c38351bf4fd4f4a
Diffstat (limited to 'src/com/android/launcher3/util')
| -rw-r--r-- | src/com/android/launcher3/util/GridOccupancy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/util/GridOccupancy.java b/src/com/android/launcher3/util/GridOccupancy.java index 3f5f0b4ed..6a10b0aa5 100644 --- a/src/com/android/launcher3/util/GridOccupancy.java +++ b/src/com/android/launcher3/util/GridOccupancy.java @@ -77,7 +77,7 @@ public class GridOccupancy { public void markCells(int cellX, int cellY, int spanX, int spanY, boolean value) { if (cellX < 0 || cellY < 0) return; for (int x = cellX; x < cellX + spanX && x < mCountX; x++) { - for (int y = cellY; y < cellY + spanY && y < mCountX; y++) { + for (int y = cellY; y < cellY + spanY && y < mCountY; y++) { cells[x][y] = value; } } |