Fix 5367072: Add thumbnail fade-in animation.

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / ui / ManageCacheDrawer.java

diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
index b1ed249..1a94bca 100644 (file)
--- a/src/com/android/gallery3d/ui/ManageCacheDrawer.java
+++ b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
@@ -56,16 +56,14 @@ public class ManageCacheDrawer extends IconDrawer {
 
     @Override
     public void draw(GLCanvas canvas, Texture content, int width,
-            int height, int rotation, Path path, int topIndex,
+            int height, int rotation, Path path,
             int dataSourceType, int mediaType, boolean isPanorama,
             int labelBackgroundHeight, boolean wantCache, boolean isCaching) {
 
-
         int x = -width / 2;
         int y = -height / 2;
 
-        drawWithRotationAndGray(canvas, content, x, y, width, height, rotation,
-                topIndex);
+        drawWithRotation(canvas, content, x, y, width, height, rotation);
 
         if (((rotation / 90) & 0x01) == 1) {
             int temp = width;
@@ -75,18 +73,11 @@ public class ManageCacheDrawer extends IconDrawer {
             y = -height / 2;
         }
 
-        drawMediaTypeOverlay(canvas, mediaType, isPanorama, x, y, width, height,
-                topIndex);
-
-        if (topIndex == 0) {
-            drawLabelBackground(canvas, width, height, labelBackgroundHeight);
-            drawIcon(canvas, width, height, dataSourceType);
-        }
-
-        if (topIndex == 0) {
-            drawCachingPin(canvas, path, dataSourceType, isCaching, wantCache,
-                    width, height);
-        }
+        drawMediaTypeOverlay(canvas, mediaType, isPanorama, x, y, width, height);
+        drawLabelBackground(canvas, width, height, labelBackgroundHeight);
+        drawIcon(canvas, width, height, dataSourceType);
+        drawCachingPin(canvas, path, dataSourceType, isCaching, wantCache,
+                width, height);
 
         if (mSelectionManager.isPressedPath(path)) {
             drawPressedFrame(canvas, x, y, width, height);