diff options
author | Michael Jurka <mikejurka@google.com> | 2012-05-08 14:30:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 14:30:12 -0700 |
commit | df4c0e25e579500a54023f92aff0dd0f2e2abc2a (patch) | |
tree | 3c41ca67f6e22253216cf57b993e6105011a15f9 /src/com/android/launcher2 | |
parent | 7112d5dbdf1861227499ecb509b1a12343215f92 (diff) | |
parent | a3d30adbfd4f013260f1f5ba3a56bc9bb4a11717 (diff) | |
download | android_packages_apps_Trebuchet-df4c0e25e579500a54023f92aff0dd0f2e2abc2a.tar.gz android_packages_apps_Trebuchet-df4c0e25e579500a54023f92aff0dd0f2e2abc2a.tar.bz2 android_packages_apps_Trebuchet-df4c0e25e579500a54023f92aff0dd0f2e2abc2a.zip |
Merge "Don't show the outline on the current page" into jb-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 28 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 69457eaec..d4a2c8458 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -1001,7 +1001,10 @@ public class CellLayout extends ViewGroup { } public void setBackgroundAlphaMultiplier(float multiplier) { - mBackgroundAlphaMultiplier = multiplier; + if (mBackgroundAlphaMultiplier != multiplier) { + mBackgroundAlphaMultiplier = multiplier; + invalidate(); + } } public float getBackgroundAlphaMultiplier() { diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index f0d339557..100055689 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -383,7 +383,7 @@ public class Workspace extends SmoothPagedView mIsDragOccuring = true; updateChildrenLayersEnabled(); mLauncher.lockScreenOrientation(); - + setChildrenBackgroundAlphaMultipliers(1f); // Prevent any Un/InstallShortcutReceivers from updating the db while we are dragging InstallShortcutReceiver.enableInstallQueue(); UninstallShortcutReceiver.enableUninstallQueue(); @@ -1194,10 +1194,7 @@ public class Workspace extends SmoothPagedView return Math.min(r / threshold, 1.0f); } - @Override - protected void screenScrolled(int screenCenter) { - super.screenScrolled(screenCenter); - + private void updatePageAlphaValues(int screenCenter) { boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX; if (mWorkspaceFadeInAdjacentScreens && mState == State.NORMAL && @@ -1209,10 +1206,29 @@ public class Workspace extends SmoothPagedView float scrollProgress = getScrollProgress(screenCenter, child, i); float alpha = 1 - Math.abs(scrollProgress); child.getShortcutsAndWidgets().setAlpha(alpha); + if (!mIsDragOccuring) { + child.setBackgroundAlphaMultiplier( + backgroundAlphaInterpolator(Math.abs(scrollProgress))); + } else { + child.setBackgroundAlphaMultiplier(1f); + } } } - invalidate(); } + } + + private void setChildrenBackgroundAlphaMultipliers(float a) { + for (int i = 0; i < getChildCount(); i++) { + CellLayout child = (CellLayout) getChildAt(i); + child.setBackgroundAlphaMultiplier(a); + } + } + + @Override + protected void screenScrolled(int screenCenter) { + super.screenScrolled(screenCenter); + + updatePageAlphaValues(screenCenter); if (mOverScrollX < 0 || mOverScrollX > mMaxScrollX) { int index = mOverScrollX < 0 ? 0 : getChildCount() - 1; |