diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-05-08 15:17:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:17:52 -0700 |
commit | d829a6c52cdcf87001e8d4189a1eb80905083abc (patch) | |
tree | 40bb2de48e9ca8d773d6ffac90ee7ca804a86cd9 /src/com/android | |
parent | e51dd93ed757c7b89467cd69932efd66b702f7f3 (diff) | |
parent | b51819ba4e1690aa43ba112be707220414e44f3b (diff) | |
download | android_packages_apps_Gallery2-d829a6c52cdcf87001e8d4189a1eb80905083abc.tar.gz android_packages_apps_Gallery2-d829a6c52cdcf87001e8d4189a1eb80905083abc.tar.bz2 android_packages_apps_Gallery2-d829a6c52cdcf87001e8d4189a1eb80905083abc.zip |
am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit 'b51819ba4e1690aa43ba112be707220414e44f3b':
Reduce max size of bitmap returned by crop dialog.
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/gallery3d/filtershow/crop/CropActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/crop/CropActivity.java b/src/com/android/gallery3d/filtershow/crop/CropActivity.java index 0558e4a7e..fcbf7bb50 100644 --- a/src/com/android/gallery3d/filtershow/crop/CropActivity.java +++ b/src/com/android/gallery3d/filtershow/crop/CropActivity.java @@ -73,7 +73,14 @@ public class CropActivity extends Activity { private static final int SELECT_PICTURE = 1; // request code for picker private static final int DEFAULT_COMPRESS_QUALITY = 90; - public static final int MAX_BMAP_IN_INTENT = 990000; + /** + * The maximum bitmap size we allow to be returned through the intent. + * Intents have a maximum of 1MB in total size. However, the Bitmap seems to + * have some overhead to hit so that we go way below the limit here to make + * sure the intent stays below 1MB.We should consider just returning a byte + * array instead of a Bitmap instance to avoid overhead. + */ + public static final int MAX_BMAP_IN_INTENT = 750000; // Flags private static final int DO_SET_WALLPAPER = 1; |