diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2013-10-14 21:19:22 -0700 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2013-10-14 21:19:22 -0700 |
| commit | 2d939fe70e52ba4805c6783b01530c8c1c67fb33 (patch) | |
| tree | cdf62a07d2ec7d58c07f5ad581aef58e0be8a774 /src/com/android/camera/util/CameraUtil.java | |
| parent | d8b555b801c5e57bfbeca27ef38bea7688286c3c (diff) | |
| download | android_packages_apps_Camera2-2d939fe70e52ba4805c6783b01530c8c1c67fb33.tar.gz android_packages_apps_Camera2-2d939fe70e52ba4805c6783b01530c8c1c67fb33.tar.bz2 android_packages_apps_Camera2-2d939fe70e52ba4805c6783b01530c8c1c67fb33.zip | |
Use Gallery intents by default.
Bug: 11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index f442f2210..9f4ea91f5 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -55,6 +55,7 @@ import com.android.camera.CameraActivity; import com.android.camera.CameraDisabledException; import com.android.camera.CameraHolder; import com.android.camera.CameraManager; +import com.android.camera.util.IntentHelper; import com.android.camera2.R; import java.io.Closeable; @@ -859,8 +860,7 @@ public class CameraUtil { try { boolean isSecureCamera = ((CameraActivity)activity).isSecureCamera(); if (!isSecureCamera) { - Intent intent = new Intent(Intent.ACTION_VIEW) - .setDataAndType(uri, "video/*") + Intent intent = IntentHelper.getVideoPlayerIntent(activity, uri) .putExtra(Intent.EXTRA_TITLE, title) .putExtra(KEY_TREAT_UP_AS_BACK, true); activity.startActivityForResult(intent, CameraActivity.REQ_CODE_DONT_SWITCH_TO_PREVIEW); @@ -934,8 +934,7 @@ public class CameraUtil { */ public static boolean launchGallery(Context ctx) { if (ApiHelper.HAS_APP_GALLERY) { - ctx.startActivity(Intent.makeMainSelectorActivity( - Intent.ACTION_MAIN, Intent.CATEGORY_APP_GALLERY)); + ctx.startActivity(IntentHelper.getGalleryIntent(ctx)); return true; } return false; |