diff options
| author | Chris Wren <cwren@android.com> | 2012-12-10 10:47:33 -0500 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2012-12-10 10:48:50 -0500 |
| commit | 6d30064994fb18e7969053bd846b29204355745d (patch) | |
| tree | c811aa1242f4aa4550573a4be32954d68c576ca7 /src | |
| parent | 2ccf92a79a2749a6fdaf5c1242f5d72de48ef111 (diff) | |
| download | android_packages_screensavers_PhotoTable-6d30064994fb18e7969053bd846b29204355745d.tar.gz android_packages_screensavers_PhotoTable-6d30064994fb18e7969053bd846b29204355745d.tar.bz2 android_packages_screensavers_PhotoTable-6d30064994fb18e7969053bd846b29204355745d.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dreams/phototable/PhotoCarousel.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 |