Revert "Retain list view element's original Alpha value"

This reverts commit 9fb7a5c. Conflicts: src/com/example/android/swipedismiss/SwipeDismissListViewTouchListener.java src/com/example/android/swipedismiss/SwipeDismissTouchListener.java
romannurik · Apr 21, 2015 · 57aba63 · 57aba63
1 parent 7555c49
commit 57aba63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/com/example/android/swipedismiss/SwipeDismissListViewTouchListener.java b/src/com/example/android/swipedismiss/SwipeDismissListViewTouchListener.java
@@ -423,4 +423,4 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
         mPendingDismisses.add(new PendingDismissData(dismissPosition, dismissView));
         animator.start();
     }
-}
+}
diff --git a/src/com/example/android/swipedismiss/SwipeDismissTouchListener.java b/src/com/example/android/swipedismiss/SwipeDismissTouchListener.java
@@ -77,9 +77,6 @@ public class SwipeDismissTouchListener implements View.OnTouchListener {
     private VelocityTracker mVelocityTracker;
     private float mTranslationX;
 
-    //View properties
-    private float mAlpha = 1f;
-
     /**
      * The callback interface used by {@link SwipeDismissTouchListener} to inform its client
      * about a successful dismissal of the view for which it was created.
@@ -144,10 +141,6 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
                     mVelocityTracker = VelocityTracker.obtain();
                     mVelocityTracker.addMovement(motionEvent);
                 }
-
-                if (mView != null) {
-                    mAlpha = mView.getAlpha();
-                }
                 return false;
             }
 
@@ -191,7 +184,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
 
                 mView.animate()
                         .translationX(0)
-                        .alpha(mAlpha)
+                        .alpha(1)
                         .setDuration(mAnimationTime)
                         .setListener(null);
                 reset();
@@ -281,7 +274,7 @@ private void performDismiss() {
             public void onAnimationEnd(Animator animation) {
                 mCallbacks.onDismiss(mView, mToken);
                 // Reset view presentation
-                mView.setAlpha(mAlpha);
+                mView.setAlpha(1f);
                 mView.setTranslationX(0);
                 lp.height = originalHeight;
                 mView.setLayoutParams(lp);
-Original file line number
+Diff line change
@@ Expand Up @@
             mPendingDismisses.add(new PendingDismissData(dismissPosition, dismissView));
             animator.start();
         }
-    }
+    }