diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-05-11 14:44:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 14:44:23 -0700 |
| commit | 28b952ad3ec46ba9d14063797c1c96984ade8deb (patch) | |
| tree | e52a3f522bc470b7fd6a99f6b4298429b70c4316 /src/com | |
| parent | e49b8c7878c41f31c817d0661f71d6196dfdde9a (diff) | |
| parent | 691a5797f9bba4154d564d3a6c9b92559ee8cc4a (diff) | |
| download | android_packages_apps_Trebuchet-28b952ad3ec46ba9d14063797c1c96984ade8deb.tar.gz android_packages_apps_Trebuchet-28b952ad3ec46ba9d14063797c1c96984ade8deb.tar.bz2 android_packages_apps_Trebuchet-28b952ad3ec46ba9d14063797c1c96984ade8deb.zip | |
Merge "Fix folder order regression (issue 6482634)" into jb-dev
Diffstat (limited to 'src/com')
| -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(); } /** |