summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-18 14:20:39 -0700
committerGeorge Mount <mount@google.com>2012-10-18 16:32:48 -0700
commit4b4dbd225685502f4249c2bf25bf74f7ce526645 (patch)
tree69bbb97d12a4111458a69a72f270c6ffe46805a4 /src_pd
parentc6ea040010a0794bc78a43c4522cfb03d9e488e2 (diff)
downloadandroid_packages_apps_Gallery2-4b4dbd225685502f4249c2bf25bf74f7ce526645.tar.gz
android_packages_apps_Gallery2-4b4dbd225685502f4249c2bf25bf74f7ce526645.tar.bz2
android_packages_apps_Gallery2-4b4dbd225685502f4249c2bf25bf74f7ce526645.zip
Remove panorama checks from supported operations.
Bug 7351383 Bug 7349438 Move panorama support checks from getSupportedOperations so that calls to getSupportedOperations are consistent. Panorama checks are moved to only based on callbacks. Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/gallery3d/util/LightCycleHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index 6ebd9eca2..68c019567 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -61,6 +61,8 @@ public class LightCycleHelper {
}
}
+ private static final PanoramaMetadata NOT_PANORAMA = new PanoramaMetadata(false, false);
+
public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
/* Do nothing */
}
@@ -70,7 +72,7 @@ public class LightCycleHelper {
}
public static PanoramaMetadata getPanoramaMetadata(Context context, Uri uri) {
- return null;
+ return NOT_PANORAMA;
}
public static CameraModule createPanoramaModule() {