diff options
| author | Owen Lin <> | 2009-03-24 23:41:27 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 23:41:27 -0700 |
| commit | 095afa19556bf550262e3cccb9edacc04e6f726a (patch) | |
| tree | c23e8d5f20fb5979b3c1e5a0cd738d073248d71c /src | |
| parent | 11c53782ca0a7be5e033bafdf0be6ac124bde8cb (diff) | |
| download | LegacyCamera-095afa19556bf550262e3cccb9edacc04e6f726a.zip LegacyCamera-095afa19556bf550262e3cccb9edacc04e6f726a.tar.gz LegacyCamera-095afa19556bf550262e3cccb9edacc04e6f726a.tar.bz2 | |
Automated import from //branches/donutburger/...@142517,142517
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/MenuHelper.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java index ed5803c..9fae480 100644 --- a/src/com/android/camera/MenuHelper.java +++ b/src/com/android/camera/MenuHelper.java @@ -63,7 +63,7 @@ public class MenuHelper { static public final int INCLUDE_CROP_MENU = (1 << 3); static public final int INCLUDE_DELETE_MENU = (1 << 4); static public final int INCLUDE_ROTATE_MENU = (1 << 5); - static public final int INCLUDE_DETAILS_MENU = (1 << 5); + static public final int INCLUDE_DETAILS_MENU = (1 << 6); static public final int MENU_SWITCH_CAMERA_MODE = 0; static public final int MENU_CAPTURE_PICTURE = 1; @@ -487,7 +487,7 @@ public class MenuHelper { static void deletePhoto(Activity activity, Runnable onDelete) { deleteImpl(activity, onDelete, true); } - + static void deleteVideo(Activity activity, Runnable onDelete) { deleteImpl(activity, onDelete, false); } @@ -543,8 +543,8 @@ public class MenuHelper { String action = switchToVideo ? MediaStore.INTENT_ACTION_VIDEO_CAMERA : MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA; Intent intent = new Intent(action); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); - activity.finish(); activity.startActivity(intent); return true; } diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 776755f..186d827 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -31,7 +31,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; -import android.database.Cursor; +import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.location.LocationManager; @@ -490,7 +490,7 @@ public class VideoCamera extends Activity implements View.OnClickListener, if (!mIsVideoCaptureIntent) { mThumbController.storeData(ImageManager.getLastVideoThumbPath()); } - + if (mStorageHint != null) { mStorageHint.cancel(); mStorageHint = null; @@ -594,9 +594,11 @@ public class VideoCamera extends Activity implements View.OnClickListener, return false; } else { addBaseMenuItems(menu); + int menuFlags = MenuHelper.INCLUDE_ALL & ~MenuHelper.INCLUDE_ROTATE_MENU + & ~MenuHelper.INCLUDE_DETAILS_MENU; MenuHelper.addImageMenuItems( menu, - MenuHelper.INCLUDE_ALL & ~MenuHelper.INCLUDE_ROTATE_MENU, + menuFlags, false, VideoCamera.this, mHandler, @@ -1010,7 +1012,7 @@ public class VideoCamera extends Activity implements View.OnClickListener, // There are two cases we are here: // (1) We are in a capture video intent, and we are reviewing the video - // we just taken. + // we just taken. // (2) The thumbnail button is clicked: we review the video associated // with the thumbnail. // For the second case, we copy the associated URI and filename to |