summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui/ManageCacheDrawer.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-09-27 19:44:36 +0800
committerChih-Chung Chang <chihchung@google.com>2011-09-28 14:04:18 +0800
commit1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be (patch)
tree212811df016950d0bcf4d181688ceff5db5906f0 /src/com/android/gallery3d/ui/ManageCacheDrawer.java
parent5050145590309e519d062421e3fc3b161375a613 (diff)
downloadandroid_packages_apps_Snap-1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be.tar.gz
android_packages_apps_Snap-1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be.tar.bz2
android_packages_apps_Snap-1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be.zip
Fix 5367072: Add thumbnail fade-in animation.
Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
Diffstat (limited to 'src/com/android/gallery3d/ui/ManageCacheDrawer.java')
-rw-r--r--src/com/android/gallery3d/ui/ManageCacheDrawer.java23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/com/android/gallery3d/ui/ManageCacheDrawer.java b/src/com/android/gallery3d/ui/ManageCacheDrawer.java
index b1ed24948..1a94bca88 100644
--- 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);