diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-30 15:34:19 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-05-01 11:48:02 -0700 |
| commit | 78a5b224eca3c702f4ecf8abd072779e32e26641 (patch) | |
| tree | fe3ad3db10478fb0586cfd4dec4b16e8ed2d527c /src/com/android/camera/CaptureAnimManager.java | |
| parent | 8788079a51a90255dce330e56afcb6674deccbf7 (diff) | |
| download | android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.tar.gz android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.tar.bz2 android_packages_apps_Snap-78a5b224eca3c702f4ecf8abd072779e32e26641.zip | |
Update capture animation
Bug: 8253060
Update preview thumb margins and size
Add touch target for thumbnail
Change-Id: I2b298de330834c42a55b4cb082148d971727f530
Diffstat (limited to 'src/com/android/camera/CaptureAnimManager.java')
| -rw-r--r-- | src/com/android/camera/CaptureAnimManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureAnimManager.java b/src/com/android/camera/CaptureAnimManager.java index b820ac9fa..f6e112d7e 100644 --- a/src/com/android/camera/CaptureAnimManager.java +++ b/src/com/android/camera/CaptureAnimManager.java @@ -19,7 +19,6 @@ package com.android.camera; import android.content.res.Resources; import android.graphics.Color; import android.os.SystemClock; -import android.util.Log; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; @@ -68,6 +67,10 @@ public class CaptureAnimManager { private int mSize; private Resources mResources; + public static int getAnimationDuration() { + return TIME_SLIDE2; + } + /* preview: camera preview view. * review: view of picture just taken. */ @@ -124,7 +127,7 @@ public class CaptureAnimManager { break; case 90: // Preview is below. mHoldX = x + mMarginTop; - mHoldY = y + mMarginRight + mSize; + mHoldY = y + mMarginRight; break; case 180: // Preview on the right. mHoldX = x + mMarginRight; |