summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/filmstrip
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-11-21 13:52:15 -0800
committerSascha Haeberling <haeberling@google.com>2013-11-21 15:36:19 -0800
commit280fd3edae1dc35ac1015bcc9532477169fad3aa (patch)
tree7685fe18213aa8c5826f1b9517e25af16661562c /src/com/android/camera/filmstrip
parent205b827d4e73692d4ac1f3448705679843db0c9b (diff)
downloadandroid_packages_apps_Camera2-280fd3edae1dc35ac1015bcc9532477169fad3aa.tar.gz
android_packages_apps_Camera2-280fd3edae1dc35ac1015bcc9532477169fad3aa.tar.bz2
android_packages_apps_Camera2-280fd3edae1dc35ac1015bcc9532477169fad3aa.zip
Introduce common services and integrate Refocus end-to-end.
Bug: 11120164 Bug: 10073814 This adds a new common CameraServices interface and a method to every module to get it. Through this we can expose common services and due to the interface, we can easily mock them for tests. Also makes the MediaSaveService not a service anymore. Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
Diffstat (limited to 'src/com/android/camera/filmstrip')
-rw-r--r--src/com/android/camera/filmstrip/FilmstripImageData.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/camera/filmstrip/FilmstripImageData.java b/src/com/android/camera/filmstrip/FilmstripImageData.java
index c6aa179b9..2b6e5160b 100644
--- a/src/com/android/camera/filmstrip/FilmstripImageData.java
+++ b/src/com/android/camera/filmstrip/FilmstripImageData.java
@@ -29,8 +29,11 @@ public interface FilmstripImageData {
/**
* Interface that is used to tell the caller whether an image is a photo
* sphere.
+ *
+ * We need to deprecate this and store this data in a separate DB for additional aux data.
*/
- public static interface PanoramaSupportCallback {
+ @Deprecated
+ public static interface AuxInfoSupportCallback {
/**
* Called when photo sphere info has been loaded.
*
@@ -38,7 +41,7 @@ public interface FilmstripImageData {
* @param isPanorama360 whether the photo sphere is a full 360
* degree horizontal panorama
*/
- void panoramaInfoAvailable(boolean isPanorama, boolean isPanorama360);
+ void auxInfoAvailable(boolean isPanorama, boolean isPanorama360, boolean isRgbz);
}
// View types.
@@ -131,16 +134,15 @@ public interface FilmstripImageData {
public void recycle();
/**
- * Asynchronously checks if the image is a photo sphere. Notifies the
- * callback when the results are available.
*/
- public void isPhotoSphere(Context context, PanoramaSupportCallback callback);
+ @Deprecated
+ public void requestAuxInfo(Context context, AuxInfoSupportCallback callback);
/**
* If the item is a valid photo sphere panorama, this method will launch
* the viewer.
*/
- public void viewPhotoSphere(PhotoSphereHelper.PanoramaViewHelper helper);
+ public void view(PhotoSphereHelper.PanoramaViewHelper helper);
/** Whether this item is a photo. */
public boolean isPhoto();