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/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 35598a2..ac41a2b 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -113,6 +113,7 @@
     // If we're actively dragging something over this screen, mIsDragOverlapping is true
     private boolean mIsDragOverlapping = false;
     private final Point mDragCenter = new Point();
+    boolean mUseActiveGlowBackground = false;
 
     // These arrays are used to implement the drag visualization on x-large screens.
     // They are used as circular arrays, indexed by mDragOutlineCurrent.
@@ -383,10 +384,15 @@
     void setIsDragOverlapping(boolean isDragOverlapping) {
         if (mIsDragOverlapping != isDragOverlapping) {
             mIsDragOverlapping = isDragOverlapping;
+            setUseActiveGlowBackground(mIsDragOverlapping);
             invalidate();
         }
     }
 
+    void setUseActiveGlowBackground(boolean use) {
+        mUseActiveGlowBackground = use;
+    }
+
     boolean getIsDragOverlapping() {
         return mIsDragOverlapping;
     }
@@ -437,7 +443,7 @@
         if (mBackgroundAlpha > 0.0f) {
             Drawable bg;
 
-            if (mIsDragOverlapping) {
+            if (mUseActiveGlowBackground) {
                 // In the mini case, we draw the active_glow bg *over* the active background
                 bg = mActiveGlowBackground;
             } else {