Remove switch menu item in both Camera and Camcorder.

Change-Id: Ic55eb043e78cc6ed7c5fea5d0a88937e964f739e

3 files changed, 0 insertions, 26 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index c6c8395..7616e3e 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1742,8 +1742,6 @@ public class Camera extends Activity implements View.OnClickListener,
     }
 
     private void addBaseMenuItems(Menu menu) {
-        MenuHelper.addSwitchModeMenuItem(menu, this, true);
-
         MenuItem gallery = menu.add(Menu.NONE, Menu.NONE,
                 MenuHelper.POSITION_GOTO_GALLERY,
                 R.string.camera_gallery_photos_text)
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index 429bd61..9ee5594 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -890,28 +890,6 @@ public class MenuHelper {
             .show();
     }
 
-    static void addSwitchModeMenuItem(
-            Menu menu, final Activity activity, boolean switchToVideo) {
-        int labelId = switchToVideo
-                ? R.string.switch_to_video_lable
-                : R.string.switch_to_camera_lable;
-        int iconId = switchToVideo
-                ? R.drawable.ic_menu_camera_video_view
-                : android.R.drawable.ic_menu_camera;
-        final String action = switchToVideo
-                ? MediaStore.INTENT_ACTION_VIDEO_CAMERA
-                : MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA;
-        MenuItem item = menu.add(Menu.NONE, Menu.NONE,
-                POSITION_SWITCH_CAMERA_MODE, labelId)
-                .setOnMenuItemClickListener(new OnMenuItemClickListener() {
-            public boolean onMenuItemClick(MenuItem item) {
-                startCameraActivity(activity, action);
-                return true;
-            }
-        });
-        item.setIcon(iconId);
-    }
-
     private static void startCameraActivity(Activity activity, String action) {
         Intent intent = new Intent(action);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index ca717f4..bd91165 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -999,8 +999,6 @@ public class VideoCamera extends Activity implements View.OnClickListener,
     }
 
     private void addBaseMenuItems(Menu menu) {
-        MenuHelper.addSwitchModeMenuItem(menu, this, false);
-
         MenuItem gallery = menu.add(Menu.NONE, Menu.NONE,
                 MenuHelper.POSITION_GOTO_GALLERY,
                 R.string.camera_gallery_photos_text)