commit 2a5bbf30855489393c7f2b5a555dca06bdf85cd8
author Chris Wren <cwren@android.com> Wed Mar 27 17:09:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 27 17:09:42 2013 -0700
tree 1b51815a5ca2281c7783e9b0facc08b96523e800
parent 998de5ac11e9b8e9b32097f35b9de89cc02ce814
parent 6d30064994fb18e7969053bd846b29204355745d

am 6d300649: flip less often if loading is slow.

* commit '6d30064994fb18e7969053bd846b29204355745d':
  flip less often if loading is slow.

src/com/android/dreams/phototable/PhotoCarousel.java

diff --git a/src/com/android/dreams/phototable/PhotoCarousel.java b/src/com/android/dreams/phototable/PhotoCarousel.java
index 70ba046..536d76b 100644
--- a/src/com/android/dreams/phototable/PhotoCarousel.java
+++ b/src/com/android/dreams/phototable/PhotoCarousel.java
@@ -80,7 +80,8 @@
                 scheduleNext((int) mDropPeriod - elapsed);
             } else {
                 scheduleNext(mDropPeriod);
-                if (changePhoto() || canFlip()) {
+                if (changePhoto() ||
+                        (elapsed > (5 * mDropPeriod) && canFlip())) {
                     flip(1f);
                     mLastFlipTime = now;
                 }
@@ -107,6 +108,7 @@
 
         mPanel = new View[2];
         mFlipper = new Flipper();
+        // this is dead code if the dream calls setInteractive(false)
         mGestureDetector = new GestureDetector(context,
                 new GestureDetector.SimpleOnGestureListener() {
                     @Override