diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-08-20 16:26:26 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-08-21 11:10:34 -0700 |
commit | 98fd8558d88db439e21fa126463ea33d2c75ccd3 (patch) | |
tree | d568aecb755c5236450fc692b2a94eeb8fcbb5ca /src/com/android/gallery3d/ui/BitmapScreenNail.java | |
parent | 183c6c994311fe4aa75dad1e42b69d83981ceeca (diff) | |
download | android_packages_apps_Snap-98fd8558d88db439e21fa126463ea33d2c75ccd3.tar.gz android_packages_apps_Snap-98fd8558d88db439e21fa126463ea33d2c75ccd3.tar.bz2 android_packages_apps_Snap-98fd8558d88db439e21fa126463ea33d2c75ccd3.zip |
Improvements in animation from album page to photo page
Bug: 6631829
Bug: 6979922
Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
Diffstat (limited to 'src/com/android/gallery3d/ui/BitmapScreenNail.java')
-rw-r--r-- | src/com/android/gallery3d/ui/BitmapScreenNail.java | 13 |
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; } |