Merge change 27109 into eclair
* changes:
Show the thumbnail box even if there is no picture taken yet.
diff --git a/src/com/android/camera/ThumbnailController.java b/src/com/android/camera/ThumbnailController.java
index 04a353f..55b9442 100644
--- a/src/com/android/camera/ThumbnailController.java
+++ b/src/com/android/camera/ThumbnailController.java
@@ -65,8 +65,6 @@
private Drawable[] mThumbs;
private TransitionDrawable mThumbTransition;
private boolean mShouldAnimateThumb;
- private final Animation mShowButtonAnimation = new AlphaAnimation(0F, 1F);
- private boolean mShouldAnimateButton;
private final Resources mResources;
// The "frame" is a drawable we want to put on top of the thumbnail.
@@ -75,7 +73,6 @@
mResources = resources;
mButton = button;
mContentResolver = contentResolver;
- mShowButtonAnimation.setDuration(500);
}
public void setData(Uri uri, Bitmap original) {
@@ -148,16 +145,10 @@
public void updateDisplayIfNeeded() {
if (mUri == null) {
- mButton.setVisibility(View.INVISIBLE);
+ mButton.setImageDrawable(null);
return;
}
- if (mShouldAnimateButton) {
- mButton.setVisibility(View.VISIBLE);
- mButton.startAnimation(mShowButtonAnimation);
- mShouldAnimateButton = false;
- }
-
if (mShouldAnimateThumb) {
mThumbTransition.startTransition(500);
mShouldAnimateThumb = false;
@@ -196,10 +187,6 @@
mShouldAnimateThumb = true;
}
mButton.setImageDrawable(drawable);
-
- if (mButton.getVisibility() != View.VISIBLE) {
- mShouldAnimateButton = true;
- }
}
public boolean isUriValid() {