diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-05-11 14:27:30 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-05-11 14:27:30 -0700 |
| commit | 691a5797f9bba4154d564d3a6c9b92559ee8cc4a (patch) | |
| tree | 20d566cb85227795c01c0505a79a4c8a8866b79a /src | |
| parent | 315b3ba6f1174f71b321301afa61cd826f7a1e97 (diff) | |
| download | android_packages_apps_Trebuchet-691a5797f9bba4154d564d3a6c9b92559ee8cc4a.tar.gz android_packages_apps_Trebuchet-691a5797f9bba4154d564d3a6c9b92559ee8cc4a.tar.bz2 android_packages_apps_Trebuchet-691a5797f9bba4154d564d3a6c9b92559ee8cc4a.zip | |
Fix folder order regression (issue 6482634)
Change-Id: I8246450ec857d0653c65d9daaf7a8b771de6c974
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index e8f1ac96b..92cabe5a4 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -323,7 +323,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList int rhIndex = rhs.cellY * mNumCols + rhs.cellX; return (lhIndex - rhIndex); } - } private void placeInReadingOrder(ArrayList<ShortcutInfo> items) { @@ -335,7 +334,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList maxX = item.cellX; } } - GridComparator gridComparator = new GridComparator(maxX); + + GridComparator gridComparator = new GridComparator(maxX + 1); Collections.sort(items, gridComparator); final int countX = mContent.getCountX(); for (int i = 0; i < count; i++) { @@ -383,6 +383,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } else { mFolderName.setText(""); } + updateItemLocationsInDatabase(); } /** |