diff options
| author | Winson Chung <winsonc@google.com> | 2011-01-10 11:45:27 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-01-10 11:46:17 -0800 |
| commit | ae222ab933a8d035394618e3782dd529cf328f08 (patch) | |
| tree | 91c24c02bbe52bf58244cc40bca80a6f7477a2d8 | |
| parent | df9de0b121973bb59f4b8a74ade3000ec201c503 (diff) | |
| download | android_packages_apps_Trebuchet-ae222ab933a8d035394618e3782dd529cf328f08.tar.gz android_packages_apps_Trebuchet-ae222ab933a8d035394618e3782dd529cf328f08.tar.bz2 android_packages_apps_Trebuchet-ae222ab933a8d035394618e3782dd529cf328f08.zip | |
Fixing issue where current page border was showing on drag after adding widget.
Change-Id: Ifd112c7ea49962575e2f4e6403f30e23c75fb5c0
| -rw-r--r-- | src/com/android/launcher2/CellLayout.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 1173e52f2..fd389caeb 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -488,7 +488,7 @@ public class CellLayout extends ViewGroup implements Dimmable, VisibilityChanged bg = mini ? mActiveBackgroundMini : mActiveGlowBackground; } else if (mIsDragOccuring && mAcceptsDrops) { bg = mini ? mActiveBackgroundMini : mActiveBackground; - } else if (mIsDefaultDropTarget) { + } else if (mIsDragOccuring && mIsDefaultDropTarget) { bg = mini ? mNormalGlowBackgroundMini : mNormalGlowBackground; } else { bg = mini ? mNormalBackgroundMini : mNormalBackground; diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index f66b09b49..9fcd1b471 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1298,6 +1298,9 @@ public class Workspace extends SmoothPagedView for (int i = 0; i < screenCount; i++) { final CellLayout cl = (CellLayout)getChildAt(i); float finalAlphaValue = (i == mCurrentPage) ? 1.0f : 0.0f; + float finalAlphaMultiplierValue = + ((i == mCurrentPage) && (mShrinkState != ShrinkState.SPRING_LOADED)) ? + 0.0f : 1.0f; float rotation = 0.0f; if (i < mCurrentPage) { @@ -1315,6 +1318,8 @@ public class Workspace extends SmoothPagedView PropertyValuesHolder.ofFloat("scaleX", finalScaleFactor), PropertyValuesHolder.ofFloat("scaleY", finalScaleFactor), PropertyValuesHolder.ofFloat("backgroundAlpha", finalBackgroundAlpha), + PropertyValuesHolder.ofFloat("backgroundAlphaMultiplier", + finalAlphaMultiplierValue), PropertyValuesHolder.ofFloat("alpha", finalAlphaValue), PropertyValuesHolder.ofFloat("rotationY", rotation)); animWithInterpolator.setDuration(duration); @@ -1326,6 +1331,7 @@ public class Workspace extends SmoothPagedView cl.setScaleX(finalScaleFactor); cl.setScaleY(finalScaleFactor); cl.setBackgroundAlpha(0.0f); + cl.setBackgroundAlphaMultiplier(finalAlphaMultiplierValue); cl.setAlpha(finalAlphaValue); cl.setRotationY(rotation); mUnshrinkAnimationListener.onAnimationEnd(null); |