From 6d30064994fb18e7969053bd846b29204355745d Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Mon, 10 Dec 2012 10:47:33 -0500
Subject: flip less often if loading is slow.

Flipping back to a photo we just saw looks like thrashing.
However we don't want to get stuck forever on a single photo.

Change-Id: I1b8f317fbcbe05a3923343c6d3d2c0f6cabefcda
---
 src/com/android/dreams/phototable/PhotoCarousel.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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 @@ public class PhotoCarousel extends FrameLayout {
                 scheduleNext((int) mDropPeriod - elapsed);
             } else {
                 scheduleNext(mDropPeriod);
-                if (changePhoto() || canFlip()) {
+                if (changePhoto() ||
+                        (elapsed > (5 * mDropPeriod) && canFlip())) {
                     flip(1f);
                     mLastFlipTime = now;
                 }
@@ -107,6 +108,7 @@ public class PhotoCarousel extends FrameLayout {
 
         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
-- 
cgit v1.2.3