summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui/SlideshowView.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2012-02-17 10:02:27 +0800
committerChih-Chung Chang <chihchung@google.com>2012-02-17 10:04:10 +0800
commit7d19f7f4281f232b9dceee4a5df390c03e2bd16b (patch)
tree2e2c95931bea43997336968da849089816470f3a /src/com/android/gallery3d/ui/SlideshowView.java
parentbb23e88996ed453ec3460d3d3bd470413d06d57c (diff)
downloadandroid_packages_apps_Gallery2-7d19f7f4281f232b9dceee4a5df390c03e2bd16b.tar.gz
android_packages_apps_Gallery2-7d19f7f4281f232b9dceee4a5df390c03e2bd16b.tar.bz2
android_packages_apps_Gallery2-7d19f7f4281f232b9dceee4a5df390c03e2bd16b.zip
Cache animation time value to reduce work and synchronize animation.
Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
Diffstat (limited to 'src/com/android/gallery3d/ui/SlideshowView.java')
-rw-r--r--src/com/android/gallery3d/ui/SlideshowView.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java
index 1bd700b69..95f4a8d23 100644
--- a/src/com/android/gallery3d/ui/SlideshowView.java
+++ b/src/com/android/gallery3d/ui/SlideshowView.java
@@ -90,14 +90,14 @@ public class SlideshowView extends GLView {
@Override
protected void render(GLCanvas canvas) {
- long currentTimeMillis = canvas.currentAnimationTimeMillis();
- boolean requestRender = mTransitionAnimation.calculate(currentTimeMillis);
+ long animTime = AnimationTime.get();
+ boolean requestRender = mTransitionAnimation.calculate(animTime);
GL11 gl = canvas.getGLInstance();
gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
float alpha = mPrevTexture == null ? 1f : mTransitionAnimation.get();
if (mPrevTexture != null && alpha != 1f) {
- requestRender |= mPrevAnimation.calculate(currentTimeMillis);
+ requestRender |= mPrevAnimation.calculate(animTime);
canvas.save(GLCanvas.SAVE_FLAG_ALPHA | GLCanvas.SAVE_FLAG_MATRIX);
canvas.setAlpha(1f - alpha);
mPrevAnimation.apply(canvas);
@@ -107,7 +107,7 @@ public class SlideshowView extends GLView {
canvas.restore();
}
if (mCurrentTexture != null) {
- requestRender |= mCurrentAnimation.calculate(currentTimeMillis);
+ requestRender |= mCurrentAnimation.calculate(animTime);
canvas.save(GLCanvas.SAVE_FLAG_ALPHA | GLCanvas.SAVE_FLAG_MATRIX);
canvas.setAlpha(alpha);
mCurrentAnimation.apply(canvas);