Merge "Replace legacy wide-angle panorama with new one." into gb-ub-photos-denali

2 files changed, 8 insertions, 5 deletions

diff --git a/src/com/android/camera/module/ModulesInfo.java b/src/com/android/camera/module/ModulesInfo.java
index 2562c4cf0..b7a1ecce9 100644
--- a/src/com/android/camera/module/ModulesInfo.java
+++ b/src/com/android/camera/module/ModulesInfo.java
@@ -49,8 +49,8 @@ public class ModulesInfo {
         registerPhotoModule(moduleManager);
         moduleManager.setDefaultModuleIndex(MODULE_PHOTO);
         registerVideoModule(moduleManager);
-        registerWideAngleModule(moduleManager);
         if (PhotoSphereHelper.hasLightCycleCapture(context)) {
+            registerWideAngleModule(moduleManager);
             registerPhotoSphereModule(moduleManager);
         }
         if (RefocusHelper.hasRefocusCapture(context)) {
@@ -108,12 +108,12 @@ public class ModulesInfo {
 
             @Override
             public boolean requestAppForCamera() {
-                return false;
+                return true;
             }
 
             @Override
             public ModuleController createModule(AppController app) {
-                return new WideAnglePanoramaModule(app);
+                return PhotoSphereHelper.createWideAnglePanoramaModule(app);
             }
         });
     }
@@ -132,8 +132,7 @@ public class ModulesInfo {
 
             @Override
             public ModuleController createModule(AppController app) {
-                // TODO: remove the type casting.
-                return (ModuleController) PhotoSphereHelper.createPanoramaModule(app);
+                return PhotoSphereHelper.createPanoramaModule(app);
             }
         });
     }
diff --git a/src_pd/com/android/camera/util/PhotoSphereHelper.java b/src_pd/com/android/camera/util/PhotoSphereHelper.java
index eb88c5c5b..a6e2a4f05 100644
--- a/src_pd/com/android/camera/util/PhotoSphereHelper.java
+++ b/src_pd/com/android/camera/util/PhotoSphereHelper.java
@@ -79,6 +79,10 @@ public class PhotoSphereHelper {
         return null;
     }
 
+    public static CameraModule createWideAnglePanoramaModule(AppController app) {
+        return null;
+    }
+
     /**
      * Get the file path from a Media storage URI.
      */