PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing unused animation style" into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Sunny Goyal
2015-06-05 17:39:48 +00:00
committed by Android (Google) Code Review
parent 26c2842f07 6ff6f6d649
commit 5eae46ce15
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DragLayer.java
-31
View File
@@ -50,7 +50,6 @@ import java.util.ArrayList;
public class DragLayer extends InsettableFrameLayout { public class DragLayer extends InsettableFrameLayout {
public static final int ANIMATION_END_DISAPPEAR = 0; public static final int ANIMATION_END_DISAPPEAR = 0;
public static final int ANIMATION_END_FADE_OUT = 1;
public static final int ANIMATION_END_REMAIN_VISIBLE = 2; public static final int ANIMATION_END_REMAIN_VISIBLE = 2;
// Scrim color without any alpha component. // Scrim color without any alpha component.
@@ -70,7 +69,6 @@ public class DragLayer extends InsettableFrameLayout {
// Variables relating to animation of views after drop // Variables relating to animation of views after drop
private ValueAnimator mDropAnim = null; private ValueAnimator mDropAnim = null;
private ValueAnimator mFadeOutAnim = null;
private final TimeInterpolator mCubicEaseOutInterpolator = new DecelerateInterpolator(1.5f); private final TimeInterpolator mCubicEaseOutInterpolator = new DecelerateInterpolator(1.5f);
@Thunk DragView mDropView = null; @Thunk DragView mDropView = null;
@Thunk int mAnchorViewInitialScrollX = 0; @Thunk int mAnchorViewInitialScrollX = 0;
@@ -762,7 +760,6 @@ public class DragLayer extends InsettableFrameLayout {
final int animationEndStyle, View anchorView) { final int animationEndStyle, View anchorView) {
// Clean up the previous animations // Clean up the previous animations
if (mDropAnim != null) mDropAnim.cancel(); if (mDropAnim != null) mDropAnim.cancel();
if (mFadeOutAnim != null) mFadeOutAnim.cancel();
// Show the drop view if it was previously hidden // Show the drop view if it was previously hidden
mDropView = view; mDropView = view;
@@ -790,9 +787,6 @@ public class DragLayer extends InsettableFrameLayout {
case ANIMATION_END_DISAPPEAR: case ANIMATION_END_DISAPPEAR:
clearAnimatedView(); clearAnimatedView();
break; break;
case ANIMATION_END_FADE_OUT:
fadeOutDragView();
break;
case ANIMATION_END_REMAIN_VISIBLE: case ANIMATION_END_REMAIN_VISIBLE:
break; break;
} }
@@ -816,31 +810,6 @@ public class DragLayer extends InsettableFrameLayout {
return mDropView; return mDropView;
} }
@Thunk void fadeOutDragView() {
mFadeOutAnim = new ValueAnimator();
mFadeOutAnim.setDuration(150);
mFadeOutAnim.setFloatValues(0f, 1f);
mFadeOutAnim.removeAllUpdateListeners();
mFadeOutAnim.addUpdateListener(new AnimatorUpdateListener() {
public void onAnimationUpdate(ValueAnimator animation) {
final float percent = (Float) animation.getAnimatedValue();
float alpha = 1 - percent;
mDropView.setAlpha(alpha);
}
});
mFadeOutAnim.addListener(new AnimatorListenerAdapter() {
public void onAnimationEnd(Animator animation) {
if (mDropView != null) {
mDragController.onDeferredEndDrag(mDropView);
}
mDropView = null;
invalidate();
}
});
mFadeOutAnim.start();
}
@Override @Override
public void onChildViewAdded(View parent, View child) { public void onChildViewAdded(View parent, View child) {
super.onChildViewAdded(parent, child); super.onChildViewAdded(parent, child);