diff options
| author | Chris Wren <cwren@android.com> | 2013-03-27 17:13:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-27 17:13:12 -0700 |
| commit | 2058c9f5c8e523580f96746e3f0c1edd882a22c5 (patch) | |
| tree | 7705026d98af4eb29b70942f17a2a00b3a2b6074 | |
| parent | 1552cabf31434dbaa67b4b7925e41b0ff82d328e (diff) | |
| parent | 2a5bbf30855489393c7f2b5a555dca06bdf85cd8 (diff) | |
| download | android_packages_screensavers_PhotoTable-2058c9f5c8e523580f96746e3f0c1edd882a22c5.tar.gz android_packages_screensavers_PhotoTable-2058c9f5c8e523580f96746e3f0c1edd882a22c5.tar.bz2 android_packages_screensavers_PhotoTable-2058c9f5c8e523580f96746e3f0c1edd882a22c5.zip | |
am 2a5bbf30: am 6d300649: flip less often if loading is slow.
* commit '2a5bbf30855489393c7f2b5a555dca06bdf85cd8':
flip less often if loading is slow.
| -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 |