diff options
| author | John Reck <jreck@google.com> | 2013-05-16 15:58:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-16 15:58:52 -0700 |
| commit | 2c4dbba15035120aec9b4c66a578d36ad47bbf3e (patch) | |
| tree | e5963feed73d63a0266ba36a0c79524faf7d1ec0 /src/com/android/gallery3d/ui | |
| parent | 2a88de414efddfe2813dea1fbe121f915e3bd07a (diff) | |
| parent | ce54df0c34bd0d8472e2c1fea4da1e0a9d8fd657 (diff) | |
| download | android_packages_apps_Snap-2c4dbba15035120aec9b4c66a578d36ad47bbf3e.tar.gz android_packages_apps_Snap-2c4dbba15035120aec9b4c66a578d36ad47bbf3e.tar.bz2 android_packages_apps_Snap-2c4dbba15035120aec9b4c66a578d36ad47bbf3e.zip | |
am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce
* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop
Diffstat (limited to 'src/com/android/gallery3d/ui')
| -rw-r--r-- | src/com/android/gallery3d/ui/MenuExecutor.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index f5d3dc397..29def0527 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.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.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 @@ public class MenuExecutor { } 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; } |