diff options
author | Angus Kong <shkong@google.com> | 2013-08-30 17:37:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 17:37:09 -0700 |
commit | 6e9cfebc56b703ba2057061ba9a9f192e645d437 (patch) | |
tree | 08019238c386ef6f215bcff002789c72f69fdeaf | |
parent | 0ee2d8c14d2a75f8616b98a026a5c9429dd3e397 (diff) | |
parent | b2f0968c90a352cca43f508d216c3f28c3d2cc16 (diff) | |
download | android_packages_apps_Snap-6e9cfebc56b703ba2057061ba9a9f192e645d437.tar.gz android_packages_apps_Snap-6e9cfebc56b703ba2057061ba9a9f192e645d437.tar.bz2 android_packages_apps_Snap-6e9cfebc56b703ba2057061ba9a9f192e645d437.zip |
am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
* commit 'b2f0968c90a352cca43f508d216c3f28c3d2cc16':
Make the preview thumbnail clicable after scaling.
-rw-r--r-- | src/com/android/camera/AnimationManager.java | 33 |
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 +} |