summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2012-10-25 15:53:42 -0700
committerRuben Brunk <rubenbrunk@google.com>2012-10-25 16:24:49 -0700
commiteb3dd15fd820ee4242d0b0799e834fbeeb5f7005 (patch)
treec282668904769e8ff7a781ed2f536ad4b7aea053 /src
parentbd0219cd5e45d98118993e355776f2bf20538e83 (diff)
downloadandroid_packages_apps_Snap-eb3dd15fd820ee4242d0b0799e834fbeeb5f7005.tar.gz
android_packages_apps_Snap-eb3dd15fd820ee4242d0b0799e834fbeeb5f7005.tar.bz2
android_packages_apps_Snap-eb3dd15fd820ee4242d0b0799e834fbeeb5f7005.zip
Fixed crop intent.
Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java2
-rw-r--r--src/com/android/gallery3d/ui/MenuExecutor.java4
2 files changed, 4 insertions, 2 deletions
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;
}