Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f09edd60: Merge change Id60fa26a into eclair

Browse Source 
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
This commit is contained in:
Ray Chen
2009-09-30 22:18:41 -07:00
committed by Android Git Automerger
parent 29c72ef336 f09edd6037
commit a6715ca6f9
3 changed files with 192 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/provider/MediaStore.java
View File

@@ -245,7 +245,7 @@ public final class MediaStore {
* requests can cancel their own requests.
*
* @param cr ContentResolver
* @param origId original image or video id
* @param origId original image or video id. use -1 to cancel all requests.
* @param baseUri the base URI of requested thumbnails
*/
static void cancelThumbnailRequest(ContentResolver cr, long origId, Uri baseUri) {
@@ -340,24 +340,28 @@ public final class MediaStore {
// We probably run out of space, so create the thumbnail in memory.
if (bitmap == null) {
Log.v(TAG, "We probably run out of space, so create the thumbnail in memory.");
int targetSize = kind == MINI_KIND ? ThumbnailUtil.THUMBNAIL_TARGET_SIZE :
ThumbnailUtil.MINI_THUMB_TARGET_SIZE;
int maxPixelNum = kind == MINI_KIND ? ThumbnailUtil.THUMBNAIL_MAX_NUM_PIXELS :
ThumbnailUtil.MINI_THUMB_MAX_NUM_PIXELS;
Uri uri = Uri.parse(
baseUri.buildUpon().appendPath(String.valueOf(origId))
.toString().replaceFirst("thumbnails", "media"));
if (isVideo) {
if (filePath == null) {
c = cr.query(uri, PROJECTION, null, null, null);
if (c != null && c.moveToFirst()) {
bitmap = ThumbnailUtil.createVideoThumbnail(c.getString(1));
if (kind == MICRO_KIND) {
bitmap = ThumbnailUtil.extractMiniThumb(bitmap,
targetSize, targetSize, ThumbnailUtil.RECYCLE_INPUT);
}
if (c == null || !c.moveToFirst()) {
return null;
}
filePath = c.getString(1);
}
if (isVideo) {
bitmap = ThumbnailUtil.createVideoThumbnail(filePath);
if (kind == MICRO_KIND) {
bitmap = ThumbnailUtil.extractMiniThumb(bitmap,
ThumbnailUtil.MINI_THUMB_TARGET_SIZE,
ThumbnailUtil.MINI_THUMB_TARGET_SIZE,
ThumbnailUtil.RECYCLE_INPUT);
}
} else {
bitmap = ThumbnailUtil.makeBitmap(targetSize, maxPixelNum, uri, cr);
bitmap = ThumbnailUtil.createImageThumbnail(cr, filePath, uri, origId,
kind, false);
}
}
} catch (SQLiteException ex) {