summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-08-31 00:34:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-31 00:34:22 +0000
commitb2f0968c90a352cca43f508d216c3f28c3d2cc16 (patch)
tree8371e3f2709fe85cfd69df7ee089ff5f3f2b1583
parent72a57ddf178b410ffb3c4532fc4e56b8b1d99706 (diff)
parent93a38d80b202a95cc0336e5cc04dbad92e43253d (diff)
downloadandroid_packages_apps_Snap-b2f0968c90a352cca43f508d216c3f28c3d2cc16.tar.gz
android_packages_apps_Snap-b2f0968c90a352cca43f508d216c3f28c3d2cc16.tar.bz2
android_packages_apps_Snap-b2f0968c90a352cca43f508d216c3f28c3d2cc16.zip
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/camera/AnimationManager.java33
1 files changed, 29 insertions, 4 deletions
diff --git a/src/com/android/camera/AnimationManager.java b/src/com/android/camera/AnimationManager.java
index 41aa4b862..5397ae02b 100644
--- a/src/com/android/camera/AnimationManager.java
+++ b/src/com/android/camera/AnimationManager.java
@@ -59,6 +59,32 @@ public class AnimationManager {
ObjectAnimator slide = ObjectAnimator.ofFloat(view, "translationX", 0f, slideDistance)
.setDuration(AnimationManager.SLIDE_DURATION);
slide.setStartDelay(AnimationManager.SHRINK_DURATION + AnimationManager.HOLD_DURATION);
+
+ ObjectAnimator translateY = ObjectAnimator.ofFloat(view, "translationY",
+ parentView.getHeight() / 2 - centerY, 0f)
+ .setDuration(AnimationManager.SHRINK_DURATION);
+ translateY.addListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animator) {
+ // Do nothing.
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animator) {
+ view.setClickable(true);
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animator) {
+ // Do nothing.
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animator) {
+ // Do nothing.
+ }
+ });
+
mCaptureAnimator = new AnimatorSet();
mCaptureAnimator.playTogether(
ObjectAnimator.ofFloat(view, "scaleX", scale, 1f)
@@ -68,13 +94,12 @@ public class AnimationManager {
ObjectAnimator.ofFloat(view, "translationX",
parentView.getWidth() / 2 - centerX, 0f)
.setDuration(AnimationManager.SHRINK_DURATION),
- ObjectAnimator.ofFloat(view, "translationY",
- parentView.getHeight() / 2 - centerY, 0f)
- .setDuration(AnimationManager.SHRINK_DURATION),
+ translateY,
slide);
mCaptureAnimator.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animator) {
+ view.setClickable(false);
view.setVisibility(View.VISIBLE);
}
@@ -154,4 +179,4 @@ public class AnimationManager {
mCaptureAnimator.cancel();
}
}
-} \ No newline at end of file
+}