diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-05-08 15:15:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:15:53 -0700 |
commit | 955549f3e24e458dc6f3b84e8a510385a88f973c (patch) | |
tree | ff3f220b46359611e20a60dcab36b6c275094aad /src/com/android/gallery3d/filtershow | |
parent | 751aad308cb146dc03e018e19a756b3f99e8e06a (diff) | |
parent | ca1717423fadab46d9c9d2f967a1a1d7eb2473ab (diff) | |
download | android_packages_apps_Snap-955549f3e24e458dc6f3b84e8a510385a88f973c.tar.gz android_packages_apps_Snap-955549f3e24e458dc6f3b84e8a510385a88f973c.tar.bz2 android_packages_apps_Snap-955549f3e24e458dc6f3b84e8a510385a88f973c.zip |
am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
-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; |