diff options
| author | Angus Kong <shkong@google.com> | 2013-09-20 18:41:46 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-09-20 19:38:53 -0700 |
| commit | b21215a1a59812592380f31891becedbdec7468b (patch) | |
| tree | 6d53599326681c626ee160508c87098da42dfd78 /src/com/android/camera/data | |
| parent | aa8744284864cda5570e8dfa4eccc2747cee52dc (diff) | |
| download | android_packages_apps_Snap-b21215a1a59812592380f31891becedbdec7468b.tar.gz android_packages_apps_Snap-b21215a1a59812592380f31891becedbdec7468b.tar.bz2 android_packages_apps_Snap-b21215a1a59812592380f31891becedbdec7468b.zip | |
Improve the animation to filmstrip.
1. Remove the snap-in-center check at the end of scale animation.
2. Don't go back to full-screen when animating from camera preview
to filmstrip.
bug:10806298
bug:10864100
Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
Diffstat (limited to 'src/com/android/camera/data')
| -rw-r--r-- | src/com/android/camera/data/CameraPreviewData.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/data/SimpleViewData.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/data/CameraPreviewData.java b/src/com/android/camera/data/CameraPreviewData.java index f6127e46f..d13465e93 100644 --- a/src/com/android/camera/data/CameraPreviewData.java +++ b/src/com/android/camera/data/CameraPreviewData.java @@ -41,7 +41,7 @@ public class CameraPreviewData extends SimpleViewData { @Override public int getViewType() { - return ImageData.TYPE_STICKY_VIEW; + return ImageData.VIEW_TYPE_STICKY; } @Override diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 17ddbca42..1f31f5f33 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -402,7 +402,7 @@ public abstract class LocalMediaData implements LocalData { @Override public int getViewType() { - return TYPE_REMOVABLE_VIEW; + return VIEW_TYPE_REMOVABLE; } @Override @@ -638,7 +638,7 @@ public abstract class LocalMediaData implements LocalData { @Override public int getViewType() { - return TYPE_REMOVABLE_VIEW; + return VIEW_TYPE_REMOVABLE; } @Override diff --git a/src/com/android/camera/data/SimpleViewData.java b/src/com/android/camera/data/SimpleViewData.java index a73a52ece..c440296b8 100644 --- a/src/com/android/camera/data/SimpleViewData.java +++ b/src/com/android/camera/data/SimpleViewData.java @@ -81,7 +81,7 @@ public class SimpleViewData implements LocalData { @Override public int getViewType() { - return FilmStripView.ImageData.TYPE_REMOVABLE_VIEW; + return FilmStripView.ImageData.VIEW_TYPE_REMOVABLE; } @Override |