Refactor the photosphere/refocus metadata loading.

1. Metadata added to allow for different attributes to describe LocalData.
2. Move the metadata loading process to image data loading.
3. LocalData.view() removed. The invocation of external viewer is moved back to
the activity.

bug:12197251

Change-Id: I496b018186f7a4b4818b976201703b966103a636

3 files changed, 10 insertions, 8 deletions

diff --git a/src/com/android/camera/filmstrip/FilmstripContentPanel.java b/src/com/android/camera/filmstrip/FilmstripContentPanel.java
index 8433d5d00..9a427fdcb 100644
--- a/src/com/android/camera/filmstrip/FilmstripContentPanel.java
+++ b/src/com/android/camera/filmstrip/FilmstripContentPanel.java
@@ -19,7 +19,7 @@ package com.android.camera.filmstrip;
 import com.android.camera.widget.FilmstripLayout;
 
 /**
- * The filmstrip panel holding the filmstrip and other widgets.
+ * The filmstrip panel holding the filmstrip and other controls/widgets.
  */
 public interface FilmstripContentPanel {
     /**
@@ -43,8 +43,10 @@ public interface FilmstripContentPanel {
     /** Sets the listener. */
     void setFilmstripListener(FilmstripLayout.Listener listener);
 
+    /** Hides this panel */
     void hide();
 
+    /** Shows this panel */
     void show();
 
     /**
diff --git a/src/com/android/camera/filmstrip/FilmstripController.java b/src/com/android/camera/filmstrip/FilmstripController.java
index cd60c0003..571589c05 100644
--- a/src/com/android/camera/filmstrip/FilmstripController.java
+++ b/src/com/android/camera/filmstrip/FilmstripController.java
@@ -175,12 +175,18 @@ public interface FilmstripController {
         public void onDataDemoted(int dataID);
 
         /**
-         *
          * Called when all the data has been reloaded.
          */
         public void onDataReloaded();
 
         /**
+         * Called when data is updated.
+         *
+         * @param dataId The ID of the updated data.
+         */
+        public void onDataUpdated(int dataId);
+
+        /**
          * The callback when the item enters full-screen state.
          *
          * @param dataId The ID of the current focused image data.
diff --git a/src/com/android/camera/filmstrip/ImageData.java b/src/com/android/camera/filmstrip/ImageData.java
index 2adbb41e1..52f8ffa01 100644
--- a/src/com/android/camera/filmstrip/ImageData.java
+++ b/src/com/android/camera/filmstrip/ImageData.java
@@ -116,12 +116,6 @@ public interface ImageData {
     public void recycle();
 
     /**
-     * If the item is a valid photo sphere panorama, this method will launch
-     * the viewer.
-     */
-    public void view(PhotoSphereHelper.PanoramaViewHelper helper);
-
-    /**
      * @return The content URI of this data, or {@code Uri.EMPTY} if not valid.
      */
     public Uri getContentUri();