summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-09-11 10:42:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-11 10:42:57 -0700
commitb6b2e0f617f7d3f6ea12d82d6add2607d341809d (patch)
tree9453f7a2f3a9adfe8025a50a6c35d21ae84ba2bd
parent3f1f1baf3a674927e25cd5cd885fb372796bd3a0 (diff)
parent4f9d4d54f2e5d9be7a737b73b8c91f1c5a5b21e8 (diff)
downloadandroid_packages_apps_Gallery2-b6b2e0f617f7d3f6ea12d82d6add2607d341809d.tar.gz
android_packages_apps_Gallery2-b6b2e0f617f7d3f6ea12d82d6add2607d341809d.tar.bz2
android_packages_apps_Gallery2-b6b2e0f617f7d3f6ea12d82d6add2607d341809d.zip
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
-rw-r--r--src_pd/com/android/gallery3d/util/LightCycleHelper.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index c7baaaa63..f8f720f90 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -20,6 +20,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import com.android.camera.CameraModule;
+
public class LightCycleHelper {
public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
@@ -41,4 +43,8 @@ public class LightCycleHelper {
public static boolean isPanorama(String filename) {
return false;
}
+
+ public static CameraModule createPanoramaModule() {
+ return null;
+ }
}