summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2009-07-28 12:20:28 -0700
committer Jason Sams <rjsams@android.com> 2009-07-28 12:20:28 -0700
commit37d7fc70dd92a29662b9e170f91ee6b35ae950ab (patch)
tree35a10f10eebba93096630248c4f4f52296cf5cf8
parentb0ec1b46d6f5b5612e33fe43a828abea79b87a00 (diff)
Fix selection and change icon loading from 565 to 8888.
-rw-r--r--libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java12
-rw-r--r--libs/rs/java/Rollo/src/com/android/rollo/RolloView.java4
2 files changed, 8 insertions, 8 deletions
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 14afaf86b9ff..46933f31a267 100644
--- a/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
+++ b/libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
@@ -187,16 +187,16 @@ public class RolloRS {
b = BitmapFactory.decodeResource(mRes, R.raw.browser, opts);
- mIcons[0] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true);
+ mIcons[0] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGBA_8888, true);
b = BitmapFactory.decodeResource(mRes, R.raw.market, opts);
- mIcons[1] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true);
+ mIcons[1] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGBA_8888, true);
b = BitmapFactory.decodeResource(mRes, R.raw.photos, opts);
- mIcons[2] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true);
+ mIcons[2] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGBA_8888, true);
b = BitmapFactory.decodeResource(mRes, R.raw.settings, opts);
- mIcons[3] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGB_565, true);
+ mIcons[3] = mRS.allocationCreateFromBitmap(b, RenderScript.ElementPredefined.RGBA_8888, true);
/*
b = BitmapFactory.decodeResource(mRes, R.raw.assasins_creed, opts);
@@ -342,8 +342,8 @@ public class RolloRS {
}
private void makeTextBitmap() {
- //Bitmap.createBitmap(width, height, Bitmap.Config);
- //new Canvas(theBitmap);
+ //Bitmap b = Bitmap.createBitmap(128, 64, Bitmap.Config);
+ //Canvas c = new Canvas(b);
//canvas.drawText();
}
diff --git a/libs/rs/java/Rollo/src/com/android/rollo/RolloView.java b/libs/rs/java/Rollo/src/com/android/rollo/RolloView.java
index 27f1584b6419..c67644becf9b 100644
--- a/libs/rs/java/Rollo/src/com/android/rollo/RolloView.java
+++ b/libs/rs/java/Rollo/src/com/android/rollo/RolloView.java
@@ -101,11 +101,11 @@ public class RolloView extends RSSurfaceView {
void computeSelection(float x, float y)
{
- float col = mColumn + (x - 0.5f) * 4 + 1;
+ float col = mColumn + (x - 0.5f) * 4 + 1.25f;
int iCol = (int)(col + 0.25f);
float row = (y / 0.8f) * mRows;
- int iRow = (int)(row - 0.25f);
+ int iRow = (int)(row - 0.5f);
mRender.setSelected(iCol * mRows + iRow);
}