diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-05-08 22:13:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-08 22:13:44 +0000 |
commit | ca1717423fadab46d9c9d2f967a1a1d7eb2473ab (patch) | |
tree | 12ad4396e56d1e7d7ca5401f0441bb25e7dc8ae8 | |
parent | 83bd9d3e7bb5402c335bad1370cef7f2351352ab (diff) | |
parent | ffaf11cbaeedc02812300fd1221ad154e37f857d (diff) | |
download | android_packages_apps_Snap-ca1717423fadab46d9c9d2f967a1a1d7eb2473ab.tar.gz android_packages_apps_Snap-ca1717423fadab46d9c9d2f967a1a1d7eb2473ab.tar.bz2 android_packages_apps_Snap-ca1717423fadab46d9c9d2f967a1a1d7eb2473ab.zip |
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
-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; |