diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-06-18 13:13:40 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-06-25 12:29:32 -0700 |
| commit | dcd297f05a866e07090d6e2af8fb4b15f28cb555 (patch) | |
| tree | 44a2b144c8b298cf12d43145cf0ef4fc55aa0324 /src/com/android/launcher3/CellLayout.java | |
| parent | 211667e4c2efc6b0b7c5037aca77eecd50bd823d (diff) | |
| download | android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.tar.gz android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.tar.bz2 android_packages_apps_Trebuchet-dcd297f05a866e07090d6e2af8fb4b15f28cb555.zip | |
Initial implementation of Shrink-wrap
Change-Id: If73c7f7ca19ca62ff43134f515584354afef8507
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index e115e43f5..35598a2f2 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -709,7 +709,10 @@ public class CellLayout extends ViewGroup { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - mCellInfo.screen = ((ViewGroup) getParent()).indexOfChild(this); + if (getParent() instanceof Workspace) { + Workspace workspace = (Workspace) getParent(); + mCellInfo.screenId = workspace.getIdForScreen(this); + } } public void setTagToCellInfoForPoint(int touchX, int touchY) { @@ -3334,7 +3337,7 @@ out: for (int i = x; i < x + spanX - 1 && x < xCount; i++) { int cellY = -1; int spanX; int spanY; - int screen; + long screenId; long container; @Override |