From 9b0b2fefb2de9aca457ab1c38ffd08d7667f4065 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 24 Feb 2012 13:03:34 -0800 Subject: Fixing issue where icons can't be clicked during launcher transition. - Also tweaking the workspace fade in/out interpolators Change-Id: I65d1aefbead13f662c84a2f1178c73615153fd5a --- src/com/android/launcher2/Launcher.java | 2 +- src/com/android/launcher2/Workspace.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/com/android') 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); } -- cgit v1.2.3