summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-10-04 14:44:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-04 14:44:34 -0700
commit22ac4de64a2917a5e2b5449b208553a42bd46e6b (patch)
tree5bbfbecdf9ac6d81af5bbf147e2235a4eff867a3 /src_pd
parentc422bd02c4063513e9974dfead3eb12f329bacb8 (diff)
parent356ffa04adff94a09fe60849b40397aa8ee018b8 (diff)
downloadandroid_packages_apps_Snap-22ac4de64a2917a5e2b5449b208553a42bd46e6b.zip
android_packages_apps_Snap-22ac4de64a2917a5e2b5449b208553a42bd46e6b.tar.gz
android_packages_apps_Snap-22ac4de64a2917a5e2b5449b208553a42bd46e6b.tar.bz2
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/gallery3d/util/LightCycleHelper.java19
1 files changed, 17 insertions, 2 deletions
diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index dcedc2d..a4da43c 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -23,6 +23,9 @@ import android.content.Intent;
import android.net.Uri;
import com.android.camera.CameraModule;
+import com.android.gallery3d.app.GalleryApp;
+import com.android.gallery3d.app.StitchingProgressManager;
+import com.android.gallery3d.data.MediaSource;
public class LightCycleHelper {
@@ -30,11 +33,11 @@ public class LightCycleHelper {
/* Do nothing */
}
- public static synchronized boolean hasLightCycleView(Context context) {
+ public static boolean hasLightCycleView(Context context) {
return false;
}
- public static synchronized boolean hasLightCycleCapture(Context context) {
+ public static boolean hasLightCycleCapture(Context context) {
return false;
}
@@ -49,4 +52,16 @@ public class LightCycleHelper {
public static CameraModule createPanoramaModule() {
return null;
}
+
+ public static StitchingProgressManager createStitchingManagerInstance(GalleryApp app) {
+ return null;
+ }
+
+ public static MediaSource createMediaSourceInstance(GalleryApp app) {
+ return null;
+ }
+
+ public static String wrapGalleryPath(String path) {
+ return path;
+ }
}