diff options
| author | Doris Liu <tianliu@google.com> | 2013-08-23 13:35:24 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-08-29 14:36:40 -0700 |
| commit | 8de13111cc4e62da3462ea321d18c7951282e0d0 (patch) | |
| tree | 6b16c5e85fd5dc5d8cbd8792c060c4043ed0fb0e /src/com/android/camera/data | |
| parent | 0df03318d36f77aaec11238854921bd45f50c035 (diff) | |
| download | android_packages_apps_Snap-8de13111cc4e62da3462ea321d18c7951282e0d0.tar.gz android_packages_apps_Snap-8de13111cc4e62da3462ea321d18c7951282e0d0.tar.bz2 android_packages_apps_Snap-8de13111cc4e62da3462ea321d18c7951282e0d0.zip | |
1:1 zoom integration
Bug: 10308195
Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
Diffstat (limited to 'src/com/android/camera/data')
| -rw-r--r-- | src/com/android/camera/data/LocalData.java | 7 | ||||
| -rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java index 45bcb9ffa..2db4ac577 100644 --- a/src/com/android/camera/data/LocalData.java +++ b/src/com/android/camera/data/LocalData.java @@ -126,13 +126,6 @@ public interface LocalData extends FilmStripView.ImageData { String getPath(); /** - * Returns the content URI of this data item. - * - * @return {@code Uri.EMPTY} if not valid. - */ - Uri getContentUri(); - - /** * @return The mimetype of this data item, or null, if this item has no * mimetype associated with it. */ diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index f692cbcc0..071a9ca52 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -313,7 +313,8 @@ public abstract class LocalMediaData implements LocalData { private static final int mSupportedUIActions = FilmStripView.ImageData.ACTION_DEMOTE - | FilmStripView.ImageData.ACTION_PROMOTE; + | FilmStripView.ImageData.ACTION_PROMOTE + | FilmStripView.ImageData.ACTION_ZOOM; private static final int mSupportedDataActions = LocalData.ACTION_DELETE; |