summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f5fe903da..749716254 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -85,6 +85,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.ShareActionProvider;
+import android.widget.Toast;
import com.android.camera.app.AppManagerFactory;
import com.android.camera.app.PlaceholderManager;
@@ -106,6 +107,8 @@ import com.android.camera.ui.ModuleSwitcher;
import com.android.camera.ui.DetailsDialog;
import com.android.camera.ui.FilmStripView;
import com.android.camera.ui.FilmStripView.ImageData;
+import com.android.camera.ui.PanoCaptureProcessView;
+import com.android.camera.ui.RotateTextToast;
import com.android.camera.util.ApiHelper;
import com.android.camera.util.CameraUtil;
import com.android.camera.util.GcamHelper;
@@ -199,6 +202,7 @@ public class CameraActivity extends Activity
private VideoModule mVideoModule;
private WideAnglePanoramaModule mPanoModule;
private CaptureModule mCaptureModule;
+ private PanoCaptureModule mPano2Module;
private FrameLayout mAboveFilmstripControlLayout;
private FrameLayout mCameraRootFrame;
private View mCameraPhotoModuleRootView;
@@ -2095,6 +2099,26 @@ public class CameraActivity extends Activity
mCurrentModule = mCaptureModule;
mCameraCaptureModuleRootView.setVisibility(View.VISIBLE);
break;
+
+ case ModuleSwitcher.PANOCAPTURE_MODULE_INDEX:
+ final Activity activity = this;
+ if(!PanoCaptureProcessView.isSupportedStatic()) {
+ this.runOnUiThread(new Runnable() {
+ public void run() {
+ RotateTextToast.makeText(activity, "Panocapture library is missing", Toast.LENGTH_SHORT).show();
+ }
+ });
+ mCurrentModuleIndex = ModuleSwitcher.PHOTO_MODULE_INDEX;
+ //Let it fall through to photo module
+ } else {
+ if (mPano2Module == null) {
+ mPano2Module = new PanoCaptureModule();
+ mPano2Module.init(this, mCameraPanoModuleRootView);
+ }
+ mCurrentModule = mPano2Module;
+ mCameraPanoModuleRootView.setVisibility(View.VISIBLE);
+ break;
+ }
case ModuleSwitcher.LIGHTCYCLE_MODULE_INDEX: //Unused module for now
case ModuleSwitcher.GCAM_MODULE_INDEX: //Unused module for now
default: