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.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index c5cbb7e8a..07cb6ced7 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -44,6 +44,7 @@ import android.widget.ImageView;
import com.android.camera.data.CameraDataAdapter;
import com.android.camera.data.LocalData;
+import com.android.camera.ui.CameraSwitcher;
import com.android.camera.ui.CameraSwitcher.CameraSwitchListener;
import com.android.camera.ui.FilmStripView;
import com.android.gallery3d.R;
@@ -55,11 +56,6 @@ public class CameraActivity extends Activity
private static final String TAG = "CAM_Activity";
- public static final int PHOTO_MODULE_INDEX = 0;
- public static final int VIDEO_MODULE_INDEX = 1;
- public static final int PANORAMA_MODULE_INDEX = 2;
- public static final int LIGHTCYCLE_MODULE_INDEX = 3;
-
private static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE =
"android.media.action.STILL_IMAGE_CAMERA_SECURE";
public static final String ACTION_IMAGE_CAPTURE_SECURE =
@@ -422,13 +418,13 @@ public class CameraActivity extends Activity
closeModule(mCurrentModule);
mCurrentModuleIndex = i;
switch (i) {
- case VIDEO_MODULE_INDEX:
+ case CameraSwitcher.VIDEO_MODULE_INDEX:
mCurrentModule = new VideoModule();
break;
- case PHOTO_MODULE_INDEX:
+ case CameraSwitcher.PHOTO_MODULE_INDEX:
mCurrentModule = new PhotoModule();
break;
- case LIGHTCYCLE_MODULE_INDEX:
+ case CameraSwitcher.LIGHTCYCLE_MODULE_INDEX:
mCurrentModule = LightCycleHelper.createPanoramaModule();
break;
default: