drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27076 into eclair

Browse Source 
* changes:
  Optimize rotary selector widget by using bitmaps instead of drawables.
This commit is contained in:
Android (Google) Code Review
2009-09-25 17:34:35 -04:00
parent 8de57d8fa3 c8ad6dcb8a
commit 0cb901c4be
1 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/com/android/internal/widget/RotarySelector.java
View File

@ -56,10 +56,10 @@ public class RotarySelector extends View {
// UI elements // UI elements
private Bitmap mBackground; private Bitmap mBackground;
private Drawable mDimple; private Bitmap mDimple;
private Drawable mLeftHandleIcon; private Bitmap mLeftHandleIcon;
private Drawable mRightHandleIcon; private Bitmap mRightHandleIcon;
private Bitmap mArrowShortLeftAndRight; private Bitmap mArrowShortLeftAndRight;
private Bitmap mArrowLongLeft; // Long arrow starting on the left, pointing clockwise private Bitmap mArrowLongLeft; // Long arrow starting on the left, pointing clockwise
@ -177,7 +177,7 @@ public class RotarySelector extends View {
// Assets (all are BitmapDrawables). // Assets (all are BitmapDrawables).
mBackground = getBitmapFor(R.drawable.jog_dial_bg); mBackground = getBitmapFor(R.drawable.jog_dial_bg);
mDimple = r.getDrawable(R.drawable.jog_dial_dimple); mDimple = getBitmapFor(R.drawable.jog_dial_dimple);
mArrowLongLeft = getBitmapFor(R.drawable.jog_dial_arrow_long_left_green); mArrowLongLeft = getBitmapFor(R.drawable.jog_dial_arrow_long_left_green);
mArrowLongRight = getBitmapFor(R.drawable.jog_dial_arrow_long_right_red); mArrowLongRight = getBitmapFor(R.drawable.jog_dial_arrow_long_right_red);
@ -187,7 +187,7 @@ public class RotarySelector extends View {
mEdgeTriggerThresh = (int) (mDensity * EDGE_TRIGGER_DIP); mEdgeTriggerThresh = (int) (mDensity * EDGE_TRIGGER_DIP);
mDimpleWidth = mDimple.getIntrinsicWidth(); mDimpleWidth = mDimple.getWidth();
mBackgroundWidth = mBackground.getWidth(); mBackgroundWidth = mBackground.getWidth();
mBackgroundHeight = mBackground.getHeight(); mBackgroundHeight = mBackground.getHeight();
@ -239,20 +239,9 @@ public class RotarySelector extends View {
* @param resId the resource ID. * @param resId the resource ID.
*/ */
public void setLeftHandleResource(int resId) { public void setLeftHandleResource(int resId) {
Drawable d = null;
if (resId != 0) { if (resId != 0) {
d = getResources().getDrawable(resId); mLeftHandleIcon = getBitmapFor(resId);
} }
setLeftHandleDrawable(d);
}
/**
* Sets the left handle icon to a given Drawable.
*
* @param d the Drawable to use as the icon, or null to remove the icon.
*/
public void setLeftHandleDrawable(Drawable d) {
mLeftHandleIcon = d;
invalidate(); invalidate();
} }
@ -265,23 +254,13 @@ public class RotarySelector extends View {
* @param resId the resource ID. * @param resId the resource ID.
*/ */
public void setRightHandleResource(int resId) { public void setRightHandleResource(int resId) {
Drawable d = null;
if (resId != 0) { if (resId != 0) {
d = getResources().getDrawable(resId); mRightHandleIcon = getBitmapFor(resId);
} }
setRightHandleDrawable(d);
}
/**
* Sets the right handle icon to a given Drawable.
*
* @param d the Drawable to use as the icon, or null to remove the icon.
*/
public void setRightHandleDrawable(Drawable d) {
mRightHandleIcon = d;
invalidate(); invalidate();
} }
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int length = isHoriz() ? final int length = isHoriz() ?
@ -699,18 +678,15 @@ public class RotarySelector extends View {
} }
/** /**
* Sets the bounds of the specified Drawable so that it's centered * Draw the bitmap so that it's centered
* on the point (x,y), then draws it onto the specified canvas. * on the point (x,y), then draws it using specified canvas.
* TODO: is there already a utility method somewhere for this? * TODO: is there already a utility method somewhere for this?
*/ */
private static void drawCentered(Drawable d, Canvas c, int x, int y) { private void drawCentered(Bitmap d, Canvas c, int x, int y) {
int w = d.getIntrinsicWidth(); int w = d.getWidth();
int h = d.getIntrinsicHeight(); int h = d.getHeight();
// if (DBG) log("--> drawCentered: " + x + " , " + y + "; intrinsic " + w + " x " + h); c.drawBitmap(d, x - (w / 2), y - (h / 2), mPaint);
d.setBounds(x - (w / 2), y - (h / 2),
x + (w / 2), y + (h / 2));
d.draw(c);
} }