summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2016-06-01 14:57:37 +0800
committerLikai Ding <likaid@codeaurora.org>2016-06-06 09:17:41 +0800
commit7905d9942c40ff802a8215be5740a0c6541edfd5 (patch)
tree7f8697c9c3abca9b9ea7cdaf81e3f6c0054dba8b /src/com/android/gallery3d/ui
parent2d5dcfc88b71ec802bdc1123b5261c0bdffc7d5b (diff)
downloadandroid_packages_apps_Gallery2-7905d9942c40ff802a8215be5740a0c6541edfd5.tar.gz
android_packages_apps_Gallery2-7905d9942c40ff802a8215be5740a0c6541edfd5.tar.bz2
android_packages_apps_Gallery2-7905d9942c40ff802a8215be5740a0c6541edfd5.zip
Gallery: remove fade-in animation
Remove fade-in animation for timeline items so it looks faster. CRs-Fixed: 1024519 Change-Id: I30231880d023374f7bb7af6c3f80d9d4fc749815
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rw-r--r--src/com/android/gallery3d/ui/TimeLineSlotRenderer.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
index b0a8a0cba..a9ee9a8db 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
@@ -23,13 +23,10 @@ import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.data.MediaObject;
import com.android.gallery3d.data.Path;
import com.android.gallery3d.glrenderer.ColorTexture;
-import com.android.gallery3d.glrenderer.FadeInTexture;
import com.android.gallery3d.glrenderer.GLCanvas;
import com.android.gallery3d.glrenderer.Texture;
import com.android.gallery3d.glrenderer.TiledTexture;
-import java.util.ArrayList;
-
public class TimeLineSlotRenderer extends AbstractSlotRenderer {
@SuppressWarnings("unused")
@@ -197,14 +194,8 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
entry.isWaitDisplayed = true;
} else if (entry.isWaitDisplayed) {
entry.isWaitDisplayed = false;
- content = new FadeInTexture(mPlaceholderColor, entry.bitmapTexture);
- entry.content = content;
}
drawContent(canvas, content, width, height, entry.rotation);
- if ((content instanceof FadeInTexture) &&
- ((FadeInTexture) content).isAnimating()) {
- renderRequestFlags |= SlotView.RENDER_MORE_FRAME;
- }
if (entry.mediaType == MediaObject.MEDIA_TYPE_VIDEO) {
drawVideoOverlay(canvas, width, height, true, 0);