From 4d7d378ce413ea4682fdc6884591fe8605b6e366 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 11 May 2012 14:27:30 -0700
Subject: [PATCH] Fix folder order regression (issue 6482634)

Change-Id: I8246450ec857d0653c65d9daaf7a8b771de6c974
---
 src/com/android/launcher2/Folder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index e8f1ac96ba..92cabe5a49 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();
     }
 
     /**