Fix 2533691 by using REVIEW intent added in Gallery.

Bug: 2533691

Change-Id: Ia8b7732a485bde5dec6b7cff0b80d4d6f08a8fee

3 files changed, 4 insertions, 9 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 4e7c819..0a04bc3 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1932,8 +1932,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
 
     private void viewLastImage() {
         if (mThumbController.isUriValid()) {
-            Intent intent = new Intent(Intent.ACTION_VIEW, mThumbController.getUri());
-            intent.putExtra(REVIEW_EXTRA_IN_GALLERY, true);
+            Intent intent = new Intent(Util.REVIEW_ACTION, mThumbController.getUri());
             try {
                 startActivity(intent);
             } catch (ActivityNotFoundException ex) {
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index a71ea24..44d5681 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -42,6 +42,8 @@ public class Util {
     public static final int DIRECTION_UP = 2;
     public static final int DIRECTION_DOWN = 3;
 
+    public static final String REVIEW_ACTION = "com.cooliris.media.action.REVIEW";
+
     private Util() {
     }
 
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 4a448cb..411386a 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -112,10 +112,6 @@ public class VideoCamera extends NoSearchActivity
 
     private static final long SHUTTER_BUTTON_TIMEOUT = 500L; // 500ms
 
-    private static final String GALLERY_PACKAGE_NAME = "com.cooliris.app";
-    private static final String GALLERY_CLASS_NAME = "com.cooliris.media.Gallery";
-    private static final String REVIEW_EXTRA_IN_GALLERY = "review";
-
     /**
      * An unpublished intent flag requesting to start recording straight away
      * and return as soon as recording is stopped.
@@ -1194,9 +1190,7 @@ public class VideoCamera extends NoSearchActivity
     private void viewLastVideo() {
         Intent intent = null;
         if (mThumbController.isUriValid()) {
-            intent = new Intent(Intent.ACTION_VIEW, mThumbController.getUri());
-            intent.setClassName(GALLERY_PACKAGE_NAME, GALLERY_CLASS_NAME);
-            intent.putExtra(REVIEW_EXTRA_IN_GALLERY, true);
+            intent = new Intent(Util.REVIEW_ACTION, mThumbController.getUri());
             try {
                 startActivity(intent);
             } catch (ActivityNotFoundException ex) {