diff options
Diffstat (limited to 'src/com/android/gallery3d/data/LocalImage.java')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 1b0384548..2b01c1e22 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -20,7 +20,6 @@ import android.annotation.TargetApi; import android.content.ContentResolver; import android.content.ContentValues; import android.database.Cursor; -import android.drm.DrmHelper; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.BitmapRegionDecoder; @@ -174,7 +173,7 @@ public class LocalImage extends LocalMediaItem { @Override public Job<Bitmap> requestImage(int type) { return new LocalImageRequest(mApplication, mPath, dateModifiedInSec, - type, filePath, mimeType); + type, filePath); } public static class LocalImageRequest extends ImageCacheRequest { @@ -187,23 +186,10 @@ public class LocalImage extends LocalMediaItem { mLocalFilePath = localFilePath; } - LocalImageRequest(GalleryApp application, Path path, long timeModified, - int type, String localFilePath, String mimeType) { - super(application, path, timeModified, type, - MediaItem.getTargetSize(type),localFilePath, mimeType); - mLocalFilePath = localFilePath; - } - @Override public Bitmap onDecodeOriginal(JobContext jc, final int type) { BitmapFactory.Options options = new BitmapFactory.Options(); options.inPreferredConfig = Bitmap.Config.ARGB_8888; - - if (DrmHelper.isDrmFile(mLocalFilePath)) { - return DecodeUtils.ensureGLCompatibleBitmap(DrmHelper - .getBitmap(mLocalFilePath, options)); - } - int targetSize = MediaItem.getTargetSize(type); // try to decode from JPEG EXIF @@ -244,41 +230,24 @@ public class LocalImage extends LocalMediaItem { @Override public BitmapRegionDecoder run(JobContext jc) { - if (DrmHelper.isDrmFile(mLocalFilePath)) { - return DrmHelper.createBitmapRegionDecoder(mLocalFilePath, - false); - } - return DecodeUtils.createBitmapRegionDecoder(jc, mLocalFilePath, false); } } @Override public int getSupportedOperations() { - int operation = SUPPORT_DELETE | SUPPORT_INFO; - if (DrmHelper.isDrmFile(getFilePath())) { - if (DrmHelper.isDrmFLBlocking(mApplication.getAndroidContext(), - getFilePath())) { - operation |= SUPPORT_SETAS; - } - operation |= SUPPORT_DRM_INFO | SUPPORT_FULL_IMAGE; - if (DrmHelper.isShareableDrmFile(getFilePath())) { - operation |= SUPPORT_SHARE; - } - } else { - operation = SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_CROP + int operation = SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_CROP | SUPPORT_SETAS | SUPPORT_PRINT | SUPPORT_INFO; - if (BitmapUtils.isSupportedByRegionDecoder(mimeType)) { - operation |= SUPPORT_FULL_IMAGE | SUPPORT_EDIT; - } + if (BitmapUtils.isSupportedByRegionDecoder(mimeType)) { + operation |= SUPPORT_FULL_IMAGE | SUPPORT_EDIT; + } - if (BitmapUtils.isRotationSupported(mimeType)) { - operation |= SUPPORT_ROTATE; - } + if (BitmapUtils.isRotationSupported(mimeType)) { + operation |= SUPPORT_ROTATE; + } - if (GalleryUtils.isValidLocation(latitude, longitude)) { - operation |= SUPPORT_SHOW_ON_MAP; - } + if (GalleryUtils.isValidLocation(latitude, longitude)) { + operation |= SUPPORT_SHOW_ON_MAP; } return operation; } @@ -344,10 +313,6 @@ public class LocalImage extends LocalMediaItem { @Override public int getMediaType() { - if (DrmHelper.isDrmFile(getFilePath())) { - return MEDIA_TYPE_DRM_IMAGE; - } - return MEDIA_TYPE_IMAGE; } |