Merge branch 'master' of https://github.com/recruit-lifestyle/WaveSwi…

…peRefreshLayout Conflicts: library/src/main/java/jp/co/recruit_lifestyle/android/widget/WaveView.java
recruit-lifestyle · Aug 18, 2015 · 95fcd03 · 95fcd03
2 parents c36ff02 + 5ba5c79
commit 95fcd03
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/library/src/main/java/jp/co/recruit_lifestyle/android/widget/WaveView.java b/library/src/main/java/jp/co/recruit_lifestyle/android/widget/WaveView.java
@@ -517,8 +517,9 @@ private void updateMaxDropHeight(int height) {
   }
 
   public void startDropAnimation() {
+    // show dropBubble again
     mDisappearCircleAnimator = ValueAnimator.ofFloat(1.f, 1.f);
-    mDisappearCircleAnimator.setDuration(1);
+    mDisappearCircleAnimator.setDuration(1); 
     mDisappearCircleAnimator.start();
 
     mDropCircleAnimator = ValueAnimator.ofFloat(500 * (mWidth / 1440.f), mMaxDropHeight);