Move calls to LightCycleHelper off the UI thread.

Bug: 7320303

Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.

Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e

1 files changed, 13 insertions, 10 deletions

diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index cc8ea20b9..995eac8b1 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -27,13 +27,20 @@ import com.android.gallery3d.app.GalleryApp;
 import com.android.gallery3d.app.StitchingProgressManager;
 
 public class LightCycleHelper {
+    public static class PanoramaMetadata {
+        // Whether a panorama viewer should be used
+        public final boolean mUsePanoramaViewer;
+        // Whether a panorama is 360 degrees
+        public final boolean mIsPanorama360;
 
-    public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
-        /* Do nothing */
+        public PanoramaMetadata(boolean usePanoramaViewer, boolean isPanorama360) {
+            mUsePanoramaViewer = usePanoramaViewer;
+            mIsPanorama360 = isPanorama360;
+        }
     }
 
-    public static boolean hasLightCycleView(Context context) {
-        return false;
+    public static void setupCaptureIntent(Context context, Intent it, String outputDir) {
+        /* Do nothing */
     }
 
     public static boolean hasLightCycleCapture(Context context) {
@@ -44,12 +51,8 @@ public class LightCycleHelper {
         /* Do nothing */
     }
 
-    public static boolean isPanorama(ContentResolver contentResolver, Uri uri) {
-        return false;
-    }
-
-    public static boolean isPanorama360(Context context, Uri uri) {
-        return false;
+    public static PanoramaMetadata getPanoramaMetadata(Context context, Uri uri) {
+        return null;
     }
 
     public static CameraModule createPanoramaModule() {