Add methods to return Camera and Gallery launcher intents.

Bug: 10820027
Change-Id: I340072c48832e23245aa041503649b40cbaf0bf0

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 533bbe8..4ed6309 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -26,7 +26,7 @@ public class CameraActivity extends Activity {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        Intent intent = IntentHelper.CAMERA_LAUNCHER_INTENT;
+        Intent intent = IntentHelper.getCameraIntent(CameraActivity.this);
         // Since this is being launched from a homescreen shorcut,
         // it's already in a new task. Start Camera activity and
         // reset the task to its initial state if needed.

diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java
index 0c1ef79..a1b6d01 100644 (file)
--- a/src/com/android/gallery3d/app/Gallery.java
+++ b/src/com/android/gallery3d/app/Gallery.java
@@ -26,7 +26,7 @@ public class Gallery extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Intent intent = IntentHelper.GALLERY_LAUNCHER_INTENT;
+        Intent intent = IntentHelper.getGalleryIntent(Gallery.this);
         // Since this is being launched from a homescreen shortcut,
         // it's already in a new task. Start Gallery activity and
         // reset the task to its initial state if needed.

diff --git a/src_pd/com/android/gallery3d/util/IntentHelper.java b/src_pd/com/android/gallery3d/util/IntentHelper.java
index 843a39f..13f69eb 100644 (file)
--- a/src_pd/com/android/gallery3d/util/IntentHelper.java
+++ b/src_pd/com/android/gallery3d/util/IntentHelper.java
@@ -15,13 +15,18 @@
  */
 package com.android.gallery3d.util;
 
+import android.content.Context;
 import android.content.Intent;
 
 public class IntentHelper {
 
-    public static final Intent CAMERA_LAUNCHER_INTENT = new Intent(Intent.ACTION_MAIN)
-        .setClassName("com.android.camera2", "com.android.camera.CameraActivity");
+    public static Intent getCameraIntent(Context context) {
+        return new Intent(Intent.ACTION_MAIN)
+            .setClassName("com.android.camera2", "com.android.camera.CameraActivity");
+    }
 
-    public static final Intent GALLERY_LAUNCHER_INTENT = new Intent(Intent.ACTION_MAIN)
-        .setClassName("com.android.gallery3d", "com.android.gallery3d.app.GalleryActivity");
+    public static Intent getGalleryIntent(Context context) {
+        return new Intent(Intent.ACTION_MAIN)
+            .setClassName("com.android.gallery3d", "com.android.gallery3d.app.GalleryActivity");
+    }
 }