diff options
| author | Ethan Chen <intervigil@gmail.com> | 2013-10-24 20:16:51 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2013-10-24 20:16:51 -0700 |
| commit | bf86b06e84ead23188ae1afbf6cc2df9e6dca6ec (patch) | |
| tree | 12f670da9e7d95fe205ba7a91d821e78fb7c1656 | |
| parent | 542ac77fc656b03245956b08b20542395721a89b (diff) | |
| download | android_packages_apps_CMFileManager-bf86b06e84ead23188ae1afbf6cc2df9e6dca6ec.tar.gz android_packages_apps_CMFileManager-bf86b06e84ead23188ae1afbf6cc2df9e6dca6ec.tar.bz2 android_packages_apps_CMFileManager-bf86b06e84ead23188ae1afbf6cc2df9e6dca6ec.zip | |
CMFileManager: Update Gallery crop activity component name
* Also handle errors incase we fail.
Change-Id: If87fc5484373ddd122973de6e76fdf61f6706d98
| -rw-r--r-- | src/com/cyanogenmod/filemanager/activities/PickerActivity.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java index 6c6b9961..f548b413 100644 --- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java +++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java @@ -18,6 +18,7 @@ package com.cyanogenmod.filemanager.activities; import android.app.Activity; import android.app.AlertDialog; +import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -98,7 +99,7 @@ public class PickerActivity extends Activity private static final ComponentName CROP_COMPONENT = new ComponentName( "com.android.gallery3d", //$NON-NLS-1$ - "com.android.gallery3d.app.CropImage"); //$NON-NLS-1$ + "com.android.gallery3d.filtershow.crop.CropActivity"); //$NON-NLS-1$ // Gallery crop editor action private static final String ACTION_CROP = "com.android.camera.action.CROP"; //$NON-NLS-1$ @@ -408,8 +409,19 @@ public class PickerActivity extends Activity intent.setData(Uri.fromFile(src)); intent.putExtras(extras); intent.setComponent(CROP_COMPONENT); - startActivityForResult(intent, RESULT_CROP_IMAGE); - return; + try { + startActivityForResult(intent, RESULT_CROP_IMAGE); + return; + } catch (ActivityNotFoundException e) { + Log.w(TAG, "Failed to find crop activity!"); + } + intent.setComponent(null); + try { + startActivityForResult(intent, RESULT_CROP_IMAGE); + return; + } catch (ActivityNotFoundException e) { + Log.w(TAG, "Failed to find any crop activity!"); + } } } |