diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-24 12:09:38 -0700 |
|---|---|---|
| committer | Bobby Georgescu <georgescu@google.com> | 2012-10-24 13:03:54 -0700 |
| commit | 474cf37aca1a88f909cc272ab5f7936726c011ab (patch) | |
| tree | 553d35adcffdcd0b6e4b5f9275dd207f8b0e54b8 /src | |
| parent | 354998d14f170e278339c1a8c0639298c970440c (diff) | |
| download | android_packages_apps_Snap-474cf37aca1a88f909cc272ab5f7936726c011ab.tar.gz android_packages_apps_Snap-474cf37aca1a88f909cc272ab5f7936726c011ab.tar.bz2 android_packages_apps_Snap-474cf37aca1a88f909cc272ab5f7936726c011ab.zip | |
Launch built-in camera app via filmstrip
Bug: 7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 2522188cf..9c38f4047 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -37,6 +37,7 @@ import android.view.MenuItem; import android.widget.RelativeLayout; import android.widget.Toast; +import com.android.camera.CameraActivity; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; @@ -351,7 +352,7 @@ public class PhotoPage extends ActivityState implements if (stayedOnCamera) { if (mAppBridge == null) { - GalleryUtils.startCameraActivity(mActivity); + launchCamera(); /* We got here by swiping from photo 1 to the placeholder, so make it be the thing that is in focus when the user presses back from @@ -695,6 +696,12 @@ public class PhotoPage extends ActivityState implements overrideTransitionToEditor(); } + private void launchCamera() { + Intent intent = new Intent(mActivity, CameraActivity.class); + mRecenterCameraOnResume = false; + mActivity.startActivity(intent); + } + private void launchPhotoEditor() { MediaItem current = mModel.getMediaItem(0); if (current == null || (current.getSupportedOperations() @@ -1161,7 +1168,7 @@ public class PhotoPage extends ActivityState implements } else if (unlock) { mActivity.getStateManager().finishState(this); } else if (launchCamera) { - GalleryUtils.startCameraActivity(mActivity); + launchCamera(); } else { toggleBars(); } |