commit 8d07b582341df0262eda91da7fbed5938bdd2337
author John Reck <jreck@google.com> Thu May 16 15:59:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 16 15:59:23 2013 -0700
tree eebf6ff059ed02f7a3679ef2403537db13725205
parent 1420dea329586ad491ea93a90a59d0d78b28d953
parent 3b7347daf572c20996607afe4cc32f9a96f8fe5d

am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
  Switch back to old crop

src/com/android/gallery3d/ui/MenuExecutor.java

diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java
index e5e77be..8f4854e 100644
--- a/src/com/android/gallery3d/ui/MenuExecutor.java
+++ b/src/com/android/gallery3d/ui/MenuExecutor.java
@@ -36,7 +36,7 @@
 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.filtershow.crop.CropActivity;
 import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.GalleryUtils;
 import com.android.gallery3d.util.ThreadPool.Job;
@@ -237,8 +237,7 @@
                 }
                 return;
             case R.id.action_crop: {
-                Intent intent = getIntentBySingleSelectedPath(FilterShowActivity.CROP_ACTION)
-                        .setClass((Activity) mActivity, FilterShowActivity.class);
+                Intent intent = getIntentBySingleSelectedPath(CropActivity.CROP_ACTION);
                 ((Activity) mActivity).startActivity(intent);
                 return;
             }