commit dedbd962dcfaf055a6835abf5b0000ce1564e51e
author Adam Cohen <adamcohen@google.com> Thu Jul 11 14:21:49 2013 -0700
committer Adam Cohen <adamcohen@google.com> Fri Jul 12 11:56:42 2013 -0700
tree 0bdf87cfb76421341efc8b1de7e33b1ee48434ce
parent ce376639c8287747e462fd67a7d2d511ac80c344

Enabling reordering

-> Reordering is enabled and persists
-> Fixed persistence issue when adding items to empty screen

Change-Id: I7c797b2c81a2988c95d8d9383be46d6ef0b7532d

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e059fee..d1959df 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2432,9 +2432,11 @@
                 mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
                         HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
                 // Disabling reordering until we sort out some issues.
-                //mWorkspace.startReordering();
-                // TODO: need to have a new way to set wallpaper or start reordering
-                startWallpaper();
+                if (mWorkspace.getIdForScreen((CellLayout) v) >= 0) {
+                    mWorkspace.startReordering();
+                } else {
+                    startWallpaper();
+                }
             } else {
                 if (!(itemUnderLongClick instanceof Folder)) {
                     // User long pressed on an item