From 764205c19420256ccc05df2a1669a7b69c5daaf9 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Thu, 16 Jul 2009 17:47:40 -0700 Subject: Fix conflict with automatic DPI support on high density devices by forcing bitmap loading to not be scaled. --- libs/rs/java/Rollo/res/drawable/browser.png | Bin 5772 -> 0 bytes libs/rs/java/Rollo/res/drawable/market.png | Bin 4810 -> 0 bytes libs/rs/java/Rollo/res/drawable/photos.png | Bin 4902 -> 0 bytes libs/rs/java/Rollo/res/drawable/settings.png | Bin 3764 -> 0 bytes libs/rs/java/Rollo/res/raw/browser.png | Bin 0 -> 5772 bytes libs/rs/java/Rollo/res/raw/market.png | Bin 0 -> 4810 bytes libs/rs/java/Rollo/res/raw/photos.png | Bin 0 -> 4902 bytes libs/rs/java/Rollo/res/raw/settings.png | Bin 0 -> 3764 bytes .../java/Rollo/src/com/android/rollo/RolloRS.java | 22 +++++++++++---------- 9 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 libs/rs/java/Rollo/res/drawable/browser.png delete mode 100644 libs/rs/java/Rollo/res/drawable/market.png delete mode 100644 libs/rs/java/Rollo/res/drawable/photos.png delete mode 100644 libs/rs/java/Rollo/res/drawable/settings.png create mode 100644 libs/rs/java/Rollo/res/raw/browser.png create mode 100644 libs/rs/java/Rollo/res/raw/market.png create mode 100644 libs/rs/java/Rollo/res/raw/photos.png create mode 100644 libs/rs/java/Rollo/res/raw/settings.png (limited to 'libs/rs/java') diff --git a/libs/rs/java/Rollo/res/drawable/browser.png b/libs/rs/java/Rollo/res/drawable/browser.png deleted file mode 100644 index 513f0be49693..000000000000 Binary files a/libs/rs/java/Rollo/res/drawable/browser.png and /dev/null differ diff --git a/libs/rs/java/Rollo/res/drawable/market.png b/libs/rs/java/Rollo/res/drawable/market.png deleted file mode 100644 index 83b6910fcdec..000000000000 Binary files a/libs/rs/java/Rollo/res/drawable/market.png and /dev/null differ diff --git a/libs/rs/java/Rollo/res/drawable/photos.png b/libs/rs/java/Rollo/res/drawable/photos.png deleted file mode 100644 index 1ed8f1e811ad..000000000000 Binary files a/libs/rs/java/Rollo/res/drawable/photos.png and /dev/null differ diff --git a/libs/rs/java/Rollo/res/drawable/settings.png b/libs/rs/java/Rollo/res/drawable/settings.png deleted file mode 100644 index dd2cd9570486..000000000000 Binary files a/libs/rs/java/Rollo/res/drawable/settings.png and /dev/null differ diff --git a/libs/rs/java/Rollo/res/raw/browser.png b/libs/rs/java/Rollo/res/raw/browser.png new file mode 100644 index 000000000000..513f0be49693 Binary files /dev/null and b/libs/rs/java/Rollo/res/raw/browser.png differ diff --git a/libs/rs/java/Rollo/res/raw/market.png b/libs/rs/java/Rollo/res/raw/market.png new file mode 100644 index 000000000000..83b6910fcdec Binary files /dev/null and b/libs/rs/java/Rollo/res/raw/market.png differ diff --git a/libs/rs/java/Rollo/res/raw/photos.png b/libs/rs/java/Rollo/res/raw/photos.png new file mode 100644 index 000000000000..1ed8f1e811ad Binary files /dev/null and b/libs/rs/java/Rollo/res/raw/photos.png differ diff --git a/libs/rs/java/Rollo/res/raw/settings.png b/libs/rs/java/Rollo/res/raw/settings.png new file mode 100644 index 000000000000..dd2cd9570486 Binary files /dev/null and b/libs/rs/java/Rollo/res/raw/settings.png differ diff --git a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java index fc928d6e1bfc..daf3aa6fa9f6 100644 --- a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java +++ b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java @@ -24,6 +24,7 @@ import android.renderscript.ProgramVertexAlloc; import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; @@ -188,20 +189,21 @@ public class RolloRS { RenderScript.ElementPredefined.USER_I32, mAllocIconIDBuf.length); - BitmapDrawable bd; Bitmap b; - - bd = (BitmapDrawable)mRes.getDrawable(R.drawable.browser); - mIcons[0] = mRS.allocationCreateFromBitmap(bd.getBitmap(), RenderScript.ElementPredefined.RGB_565, true); + BitmapFactory.Options opts = new BitmapFactory.Options(); + opts.inScaled = false; + + b = BitmapFactory.decodeResource(mRes, R.raw.browser, opts); + mIcons[0] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true); - bd = (BitmapDrawable)mRes.getDrawable(R.drawable.market); - mIcons[1] = mRS.allocationCreateFromBitmap(bd.getBitmap(), RenderScript.ElementPredefined.RGB_565, true); + b = BitmapFactory.decodeResource(mRes, R.raw.market, opts); + mIcons[1] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true); - bd = (BitmapDrawable)mRes.getDrawable(R.drawable.photos); - mIcons[2] = mRS.allocationCreateFromBitmap(bd.getBitmap(), RenderScript.ElementPredefined.RGB_565, true); + b = BitmapFactory.decodeResource(mRes, R.raw.photos, opts); + mIcons[2] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true); - bd = (BitmapDrawable)mRes.getDrawable(R.drawable.settings); - mIcons[3] = mRS.allocationCreateFromBitmap(bd.getBitmap(), RenderScript.ElementPredefined.RGB_565, true); + b = BitmapFactory.decodeResource(mRes, R.raw.settings, opts); + mIcons[3] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true); for(int ct=0; ct < mIcons.length; ct++) { mIcons[ct].uploadToTexture(0); -- cgit v1.2.3-59-g8ed1b