diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-04 00:45:37 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-04 16:21:20 +0200 |
commit | eadbfc564d84aaf1d800da3d0d6edf6312f89648 (patch) | |
tree | 8bb3858af8f7e2d7bbcf8ccff4b8904856d1c376 /src/com/android/photos/BitmapRegionTileSource.java | |
parent | 8b3cd79082043a08c319f1550679d4078b7d509c (diff) | |
download | android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.gz android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.bz2 android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.zip |
Move wallpapers to external activity
Also renaming Launcher's ApplicationInfo to
AppInfo since ApplicationInfo is already a
framework class
Change-Id: Ib3e91d2ba4ace458d790a26c0ce850870fd3f146
Diffstat (limited to 'src/com/android/photos/BitmapRegionTileSource.java')
-rw-r--r-- | src/com/android/photos/BitmapRegionTileSource.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/com/android/photos/BitmapRegionTileSource.java b/src/com/android/photos/BitmapRegionTileSource.java index 964748523..5f6401868 100644 --- a/src/com/android/photos/BitmapRegionTileSource.java +++ b/src/com/android/photos/BitmapRegionTileSource.java @@ -18,6 +18,7 @@ package com.android.photos; import android.annotation.TargetApi; import android.content.Context; +import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.graphics.BitmapFactory; @@ -68,18 +69,19 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { private Canvas mCanvas; public BitmapRegionTileSource(Context context, String path, int previewSize, int rotation) { - this(context, path, null, 0, previewSize, rotation); + this(null, context, path, null, 0, previewSize, rotation); } public BitmapRegionTileSource(Context context, Uri uri, int previewSize, int rotation) { - this(context, null, uri, 0, previewSize, rotation); + this(null, context, null, uri, 0, previewSize, rotation); } - public BitmapRegionTileSource(Context context, int resId, int previewSize, int rotation) { - this(context, null, null, resId, previewSize, rotation); + public BitmapRegionTileSource(Resources res, + Context context, int resId, int previewSize, int rotation) { + this(res, context, null, null, resId, previewSize, rotation); } - private BitmapRegionTileSource( + private BitmapRegionTileSource(Resources res, Context context, String path, Uri uri, int resId, int previewSize, int rotation) { mTileSize = TiledImageRenderer.suggestedTileSize(context); mRotation = rotation; @@ -91,7 +93,7 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { BufferedInputStream bis = new BufferedInputStream(is); mDecoder = BitmapRegionDecoder.newInstance(bis, true); } else { - InputStream is = context.getResources().openRawResource(resId); + InputStream is = res.openRawResource(resId); BufferedInputStream bis = new BufferedInputStream(is); mDecoder = BitmapRegionDecoder.newInstance(bis, true); } @@ -109,7 +111,7 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { // Although this is the same size as the Bitmap that is likely already // loaded, the lifecycle is different and interactions are on a different // thread. Thus to simplify, this source will decode its own bitmap. - Bitmap preview = decodePreview(context, path, uri, resId, previewSize); + Bitmap preview = decodePreview(res, context, path, uri, resId, previewSize); if (preview.getWidth() <= GL_SIZE_LIMIT && preview.getHeight() <= GL_SIZE_LIMIT) { mPreview = new BitmapTexture(preview); } else { @@ -213,7 +215,8 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { * Note that the returned bitmap may have a long edge that's longer * than the targetSize, but it will always be less than 2x the targetSize */ - private Bitmap decodePreview(Context context, String file, Uri uri, int resId, int targetSize) { + private Bitmap decodePreview( + Resources res, Context context, String file, Uri uri, int resId, int targetSize) { float scale = (float) targetSize / Math.max(mWidth, mHeight); mOptions.inSampleSize = BitmapUtils.computeSampleSizeLarger(scale); mOptions.inJustDecodeBounds = false; @@ -230,7 +233,7 @@ public class BitmapRegionTileSource implements TiledImageRenderer.TileSource { Log.w("BitmapRegionTileSource", "getting preview failed", e); } } else { - result = BitmapFactory.decodeResource(context.getResources(), resId, mOptions); + result = BitmapFactory.decodeResource(res, resId, mOptions); } if (result == null) { return null; |