diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2012-10-25 16:59:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-25 16:59:41 -0700 |
| commit | 817e1edb66e0b0b75494f46d4a509e4f48730a7f (patch) | |
| tree | d242cfdfa86a85bcd7ecd8de35d1452412a82a63 /src | |
| parent | f6ac061eb455fff6e8d08410f70db2dffbaa9213 (diff) | |
| parent | eb3dd15fd820ee4242d0b0799e834fbeeb5f7005 (diff) | |
| download | android_packages_apps_Snap-817e1edb66e0b0b75494f46d4a509e4f48730a7f.tar.gz android_packages_apps_Snap-817e1edb66e0b0b75494f46d4a509e4f48730a7f.tar.bz2 android_packages_apps_Snap-817e1edb66e0b0b75494f46d4a509e4f48730a7f.zip | |
Merge "Fixed crop intent." into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/MenuExecutor.java | 4 |
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; } |