Fixing issue where icons can't be clicked during launcher transition.
- Also tweaking the workspace fade in/out interpolators Change-Id: I65d1aefbead13f662c84a2f1178c73615153fd5a
This commit is contained in:
parent
7747119b40
commit
9b0b2fefb2
|
@ -1731,7 +1731,7 @@ public final class Launcher extends Activity
|
|||
return;
|
||||
}
|
||||
|
||||
if (mWorkspace.isSwitchingState()) {
|
||||
if (!mWorkspace.isFinishedSwitchingState()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue