Merge "Fixed crop intent." into gb-ub-photos-arches

4 files changed, 11 insertions, 6 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d8ade784..b147aa1c1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -243,7 +243,12 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
             <intent-filter android:label="@string/crop_label">
-                <action android:name="com.android.camera.action.CROP" />
+                <action android:name="com.android.camera.action.EDITOR_CROP" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+                <data android:scheme="" />
                 <data android:mimeType="image/*" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.ALTERNATIVE" />
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 42e624880..1f00e8aeb 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -16,10 +16,8 @@
 
 <resources>
 
-    <!--  Name for the image editor activity [CHAR LIMIT=NONE]-->
-    <string name="app_name">FilterShow</string>
     <!--  Title for the image editor activity [CHAR LIMIT=NONE]-->
-    <string name="title_activity_filter_show">FilterShowActivity</string>
+    <string name="title_activity_filter_show">Photo Editor</string>
 
     <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
     <string name="cannot_load_image">Cannot load the image!</string>
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 0a6bb2dd3..55a0103b7 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -97,7 +97,7 @@ import java.util.Vector;
 public class FilterShowActivity extends Activity implements OnItemClickListener,
         OnShareTargetSelectedListener {
 
-    public static final String CROP_ACTION = "com.android.camera.action.CROP";
+    public static final String CROP_ACTION = "com.android.camera.action.EDITOR_CROP";
     public static final String TINY_PLANET_ACTION = "com.android.camera.action.TINY_PLANET";
     public static final String LAUNCH_FULLSCREEN = "launch-fullscreen";
     private final PanelController mPanelController = new PanelController();
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index 50238288e..f432333ce 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -37,6 +37,7 @@ import com.android.gallery3d.data.DataManager;
 import com.android.gallery3d.data.MediaItem;
 import com.android.gallery3d.data.MediaObject;
 import com.android.gallery3d.data.Path;
+import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.GalleryUtils;
 import com.android.gallery3d.util.ThreadPool.Job;
@@ -226,7 +227,8 @@ public class MenuExecutor {
                 }
                 return;
             case R.id.action_crop: {
-                Intent intent = getIntentBySingleSelectedPath(CropImage.ACTION_CROP);
+                Intent intent = getIntentBySingleSelectedPath(FilterShowActivity.CROP_ACTION)
+                        .setClass((Activity) mActivity, FilterShowActivity.class);
                 ((Activity) mActivity).startActivity(intent);
                 return;
             }