diff options
author | Winson Chung <winsonc@google.com> | 2012-02-24 13:09:05 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 13:09:05 -0800 |
commit | 325f7fef37aa11bedc78d9d0064437fa5413e0ac (patch) | |
tree | 0a54db7738180ed69179dcdcef342744b6310396 /src/com/android/launcher2 | |
parent | 6cfafb96c3b108fec90897c1a251229be9861ddb (diff) | |
parent | 9b0b2fefb2de9aca457ab1c38ffd08d7667f4065 (diff) | |
download | android_packages_apps_Trebuchet-325f7fef37aa11bedc78d9d0064437fa5413e0ac.tar.gz android_packages_apps_Trebuchet-325f7fef37aa11bedc78d9d0064437fa5413e0ac.tar.bz2 android_packages_apps_Trebuchet-325f7fef37aa11bedc78d9d0064437fa5413e0ac.zip |
Merge "Fixing issue where icons can't be clicked during launcher transition."
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index c8e7e32c8..bd8fd8a86 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1731,7 +1731,7 @@ public final class Launcher extends Activity return; } - if (mWorkspace.isSwitchingState()) { + if (!mWorkspace.isFinishedSwitchingState()) { return; } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 0b75521c1..c9898c8fe 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -367,7 +367,7 @@ public class Workspace extends SmoothPagedView // Fade out the workspace slightly to highlight the currently dragging item animate().alpha(mDragFadeOutAlpha) - .setInterpolator(new AccelerateInterpolator()) + .setInterpolator(new AccelerateInterpolator(1.5f)) .setDuration(mDragFadeOutDuration) .start(); } @@ -379,7 +379,7 @@ public class Workspace extends SmoothPagedView // Fade the workspace back in after we have completed dragging animate().alpha(1f) - .setInterpolator(new AccelerateInterpolator()) + .setInterpolator(new DecelerateInterpolator(1.5f)) .setDuration(mDragFadeOutDuration) .start(); } @@ -605,7 +605,7 @@ public class Workspace extends SmoothPagedView /** This differs from isSwitchingState in that we take into account how far the transition * has completed. */ - private boolean isFinishedSwitchingState() { + public boolean isFinishedSwitchingState() { return !mIsSwitchingState || (mTransitionProgress > 0.5f); } |