Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/ui/BitmapScreenNail.java b/src/com/android/gallery3d/ui/BitmapScreenNail.java
index 6cb36b092..57685e8e5 100644
--- a/src/com/android/gallery3d/ui/BitmapScreenNail.java
+++ b/src/com/android/gallery3d/ui/BitmapScreenNail.java
@@ -36,6 +36,7 @@ public class BitmapScreenNail implements ScreenNail {
     private static final int PLACEHOLDER_COLOR = 0xFF222222;
     // The duration of the fading animation in milliseconds
     private static final int DURATION = 180;
+    private static boolean mDrawPlaceholder = true;
 
     private static final int MAX_SIDE = 640;
 
@@ -139,13 +140,23 @@ public class BitmapScreenNail implements ScreenNail {
         mBitmap = null;
     }
 
+    public static void disableDrawPlaceholder() {
+        mDrawPlaceholder = false;
+    }
+
+    public static void enableDrawPlaceholder() {
+        mDrawPlaceholder = true;
+    }
+
     @Override
     public void draw(GLCanvas canvas, int x, int y, int width, int height) {
         if (mBitmap == null) {
             if (mAnimationStartTime == ANIMATION_NOT_NEEDED) {
                 mAnimationStartTime = ANIMATION_NEEDED;
             }
-            canvas.fillRect(x, y, width, height, PLACEHOLDER_COLOR);
+            if(mDrawPlaceholder) {
+                canvas.fillRect(x, y, width, height, PLACEHOLDER_COLOR);
+            }
             return;
         }