diff options
| -rw-r--r-- | src/com/android/camera/ReviewImage.java | 9 | ||||
| -rw-r--r-- | src/com/android/camera/Util.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/ViewImage.java | 11 |
3 files changed, 7 insertions, 18 deletions
diff --git a/src/com/android/camera/ReviewImage.java b/src/com/android/camera/ReviewImage.java index 5ea4196..9d6d146 100644 --- a/src/com/android/camera/ReviewImage.java +++ b/src/com/android/camera/ReviewImage.java @@ -1022,9 +1022,6 @@ class ReviewImageGetter { @SuppressWarnings("unused") private static final String TAG = "ImageGetter"; - // The delay in msec between decoding a thumbnail and a full size image. - private static final int delayOfDecodingFullSizeImage = 1000; - // The thread which does the work. private final Thread mGetterThread; @@ -1143,7 +1140,7 @@ class ReviewImageGetter { if (image != null && !isCanceled()) { mLoad = image.fullSizeBitmapCancelable( sizeToUse, - Util.createPurgeableOption()); + Util.createNativeAllocOptions()); } if (mLoad != null) { // The return value could be null if the @@ -1167,9 +1164,7 @@ class ReviewImageGetter { lastPosition, offset, false, b); mViewImage.mHandler - .postDelayedGetterCallback( - cb, - delayOfDecodingFullSizeImage); + .postGetterCallback(cb); } } } diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java index d709aba..356426f 100644 --- a/src/com/android/camera/Util.java +++ b/src/com/android/camera/Util.java @@ -483,10 +483,9 @@ public class Util { } // Returns Options that set the puregeable flag for Bitmap decode. - public static BitmapFactory.Options createPurgeableOption() { + public static BitmapFactory.Options createNativeAllocOptions() { BitmapFactory.Options options = new BitmapFactory.Options(); - options.inPurgeable = true; - options.inInputShareable = true; + options.inNativeAlloc = true; return options; } } diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index 0e66576..424721c 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -1244,9 +1244,6 @@ class ImageGetter { @SuppressWarnings("unused") private static final String TAG = "ImageGetter"; - // The delay in msec between decoding a thumbnail and a full size image. - private static final int delayOfDecodingFullSizeImage = 1000; - // The thread which does the work. private final Thread mGetterThread; @@ -1365,7 +1362,7 @@ class ImageGetter { if (image != null && !isCanceled()) { mLoad = image.fullSizeBitmapCancelable( sizeToUse, - Util.createPurgeableOption()); + Util.createNativeAllocOptions()); } if (mLoad != null) { // The return value could be null if the @@ -1388,10 +1385,8 @@ class ImageGetter { Runnable cb = callback( lastPosition, offset, false, b); - mViewImage.mHandler - .postDelayedGetterCallback( - cb, - delayOfDecodingFullSizeImage); + mViewImage.mHandler. + postGetterCallback(cb); } } } |