Bring back the bottom controls in Filmstrip.

  Bug: 10367172
  Bug: 10074320

Also hooks up the Edit button and the edit menu item.

Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c

3 files changed, 31 insertions, 0 deletions

diff --git a/src/com/android/camera/data/LocalData.java b/src/com/android/camera/data/LocalData.java
index e25e93327..82567120e 100644
--- a/src/com/android/camera/data/LocalData.java
+++ b/src/com/android/camera/data/LocalData.java
@@ -103,6 +103,12 @@ public interface LocalData extends FilmStripView.ImageData {
     Uri getContentUri();
 
     /**
+     * @return The mimetype of this data item, or null, if this item has no
+     *         mimetype associated with it.
+     */
+    String getMimeType();
+
+    /**
      * Return media data (such as EXIF) for the item.
      */
     MediaDetails getMediaDetails(Context context);
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index 131c7e7db..7a63ddf17 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -211,6 +211,11 @@ public abstract class LocalMediaData implements LocalData {
     }
 
     @Override
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    @Override
     public abstract int getViewType();
 
     protected abstract BitmapLoadTask getBitmapLoadTask(
@@ -392,6 +397,11 @@ public abstract class LocalMediaData implements LocalData {
         }
 
         @Override
+        public boolean isPhoto() {
+            return true;
+        }
+
+        @Override
         protected BitmapLoadTask getBitmapLoadTask(
                 ImageView v, int decodeWidth, int decodeHeight) {
             return new PhotoBitmapLoadTask(v, decodeWidth, decodeHeight);
@@ -616,6 +626,11 @@ public abstract class LocalMediaData implements LocalData {
         }
 
         @Override
+        public boolean isPhoto() {
+            return false;
+        }
+
+        @Override
         protected BitmapLoadTask getBitmapLoadTask(
                 ImageView v, int decodeWidth, int decodeHeight) {
             return new VideoBitmapLoadTask(v);
diff --git a/src/com/android/camera/data/SimpleViewData.java b/src/com/android/camera/data/SimpleViewData.java
index 59d5f2cd5..06ff3501b 100644
--- a/src/com/android/camera/data/SimpleViewData.java
+++ b/src/com/android/camera/data/SimpleViewData.java
@@ -155,4 +155,14 @@ public class SimpleViewData implements LocalData {
     public double[] getLatLong() {
         return null;
     }
+
+    @Override
+    public boolean isPhoto() {
+        return false;
+    }
+
+    @Override
+    public String getMimeType() {
+        return null;
+    }
 }