fix #14

Author: daimajia

demo/src/main/java/com/daimajia/slider/demo/MainActivity.java

@@ -61,7 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mDemoSlider.setPresetTransformer(SliderLayout.Transformer.Accordion);
         mDemoSlider.setPresetIndicator(SliderLayout.PresetIndicators.Center_Bottom);
         mDemoSlider.setCustomAnimation(new DescriptionAnimation());
-        mDemoSlider.setDuration(3400);
+        mDemoSlider.setDuration(4000);
         ListView l = (ListView)findViewById(R.id.transformers);
         l.setAdapter(new TransformerAdapter(this));
         l.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -91,9 +91,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()){
             case R.id.action_custom_indicator:
+                mDemoSlider.stopAutoCycle();
                 mDemoSlider.setCustomIndicator((PagerIndicator) findViewById(R.id.custom_indicator));
                 break;
             case R.id.action_custom_child_animation:
+                mDemoSlider.startAutoCycle();
                 mDemoSlider.setCustomAnimation(new ChildAnimationExample());
                 break;
             case R.id.action_restore_default:

library/src/main/java/com/daimajia/slider/library/SliderLayout.java

@@ -121,11 +121,10 @@ public class SliderLayout extends RelativeLayout{
     private boolean mCycling;
 
     /**
-     * If auto recover after user touch the {@link com.daimajia.slider.library.Tricks.ViewPagerEx}
+     * Determine if auto recover after user touch the {@link com.daimajia.slider.library.Tricks.ViewPagerEx}
      */
     private boolean mAutoRecover = true;
 
-
     private int mTransformerId;
 
     /**
@@ -138,7 +137,7 @@ public class SliderLayout extends RelativeLayout{
     /**
      * the duration between animation.
      */
-    private long mSliderDuration = 3400;
+    private long mSliderDuration = 4000;
 
     /**
      * Visibility of {@link com.daimajia.slider.library.Indicators.PagerIndicator}
@@ -249,6 +248,8 @@ public void startAutoCycle(){
     public void startAutoCycle(long delay,long duration,boolean autoRecover){
         if(mCycleTimer != null) mCycleTimer.cancel();
         if(mCycleTask != null) mCycleTask.cancel();
+        if(mResumingTask != null) mResumingTask.cancel();
+        if(mResumingTimer != null) mResumingTimer.cancel();
         mSliderDuration = duration;
         mCycleTimer = new Timer();
         mAutoRecover = autoRecover;
@@ -260,6 +261,7 @@ public void run() {
         };
         mCycleTimer.schedule(mCycleTask,delay,mSliderDuration);
         mCycling = true;
+        mAutoCycle = true;
     }
 
     /**
@@ -304,13 +306,14 @@ public void stopAutoCycle(){
         if(mResumingTask!=null){
             mResumingTask.cancel();
         }
+        mAutoCycle = false;
     }
 
     /**
      * when paused cycle, this method can weak it up.
      */
     private void recoverCycle(){
-        if(!mAutoRecover){
+        if(!mAutoRecover || !mAutoCycle){
             return;
         }