Fixing issue where icons can't be clicked during launcher transition.
- Also tweaking the workspace fade in/out interpolators
Change-Id: I65d1aefbead13f662c84a2f1178c73615153fd5a
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index c8e7e32..bd8fd8a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1731,7 +1731,7 @@
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 0b75521..c9898c8 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -367,7 +367,7 @@
// 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 @@
// 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 @@
/** 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);
}