diff options
author | Angus Kong <shkong@google.com> | 2013-05-16 16:59:39 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-05-16 18:29:32 -0700 |
commit | 87f9a62f473a3c57505e2877b0a46ab3cb5e62ac (patch) | |
tree | 35ad686478b5c0815e0e1f5b98579a5e290cc649 /src/com/android/camera/data | |
parent | 1bd01a1efc3f1e3fbe89481f08689633a3f15f34 (diff) | |
download | android_packages_apps_Snap-87f9a62f473a3c57505e2877b0a46ab3cb5e62ac.tar.gz android_packages_apps_Snap-87f9a62f473a3c57505e2877b0a46ab3cb5e62ac.tar.bz2 android_packages_apps_Snap-87f9a62f473a3c57505e2877b0a46ab3cb5e62ac.zip |
Add remove UI in FilmStripView
1. Add UI support for swipe to delete.
2. Don't set children padding.
Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
Diffstat (limited to 'src/com/android/camera/data')
-rw-r--r-- | src/com/android/camera/data/CameraDataAdapter.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/data/LocalData.java | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java index 1fb9465a6..2bce1b4fd 100644 --- a/src/com/android/camera/data/CameraDataAdapter.java +++ b/src/com/android/camera/data/CameraDataAdapter.java @@ -117,6 +117,12 @@ public class CameraDataAdapter implements FilmStripView.DataAdapter { } } + public void removeData(int dataID) { + if (dataID >= mImages.size()) return; + LocalData d = mImages.remove(dataID); + mListener.onDataRemoved(dataID, d); + } + private LocalData buildCameraImageData(int width, int height) { LocalData d = new CameraPreviewData(width, height); return d; diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 1fda9eb67..1f60160a9 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -208,6 +208,10 @@ abstract interface LocalData extends FilmStripView.ImageData { ImageColumns.HEIGHT, // 8, int }; + private static final int mSupportedAction = + FilmStripView.ImageData.ACTION_DEMOTE + | FilmStripView.ImageData.ACTION_PROMOTE; + // 32K buffer. private static final byte[] DECODE_TEMP_STORAGE = new byte[32 * 1024]; @@ -263,6 +267,11 @@ abstract interface LocalData extends FilmStripView.ImageData { } @Override + public boolean isActionSupported(int action) { + return ((action & mSupportedAction) != 0); + } + + @Override protected BitmapLoadTask getBitmapLoadTask( ImageView v, int decodeWidth, int decodeHeight) { return new PhotoBitmapLoadTask(v, decodeWidth, decodeHeight); @@ -327,6 +336,11 @@ abstract interface LocalData extends FilmStripView.ImageData { public static final int COL_WIDTH = 6; public static final int COL_HEIGHT = 7; + private static final int mSupportedActions = + FilmStripView.ImageData.ACTION_DEMOTE + | FilmStripView.ImageData.ACTION_PROMOTE + | FilmStripView.ImageData.ACTION_PLAY; + static final String QUERY_ORDER = VideoColumns.DATE_TAKEN + " DESC, " + VideoColumns._ID + " DESC"; static final String[] QUERY_PROJECTION = { @@ -382,6 +396,11 @@ abstract interface LocalData extends FilmStripView.ImageData { } @Override + public boolean isActionSupported(int action) { + return ((action & mSupportedActions) != 0); + } + + @Override protected BitmapLoadTask getBitmapLoadTask( ImageView v, int decodeWidth, int decodeHeight) { return new VideoBitmapLoadTask(v); |