diff options
author | Adam Cohen <adamcohen@google.com> | 2013-07-11 14:21:49 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-07-12 11:56:42 -0700 |
commit | dedbd962dcfaf055a6835abf5b0000ce1564e51e (patch) | |
tree | 0bdf87cfb76421341efc8b1de7e33b1ee48434ce /src/com/android/launcher3/CellLayout.java | |
parent | ce376639c8287747e462fd67a7d2d511ac80c344 (diff) | |
download | android_packages_apps_Trebuchet-dedbd962dcfaf055a6835abf5b0000ce1564e51e.tar.gz android_packages_apps_Trebuchet-dedbd962dcfaf055a6835abf5b0000ce1564e51e.tar.bz2 android_packages_apps_Trebuchet-dedbd962dcfaf055a6835abf5b0000ce1564e51e.zip |
Enabling reordering
-> Reordering is enabled and persists
-> Fixed persistence issue when adding items to empty screen
Change-Id: I7c797b2c81a2988c95d8d9383be46d6ef0b7532d
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 35598a2f2..ac41a2bd7 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -113,6 +113,7 @@ public class CellLayout extends ViewGroup { // 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 @@ public class CellLayout extends ViewGroup { 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 @@ public class CellLayout extends ViewGroup { 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 { |