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

Merge change If933b13d into eclair

Browse Source 
* changes:
  Fix for 2161835: Tweaks to rotary lock screen:
This commit is contained in:
Android (Google) Code Review
2009-10-06 17:34:17 -04:00
parent 968a9571a3 5037e57fd4
commit f65161f159
1 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ public class RotarySelector extends View {
private static final String LOG_TAG = "RotarySelector"; private static final String LOG_TAG = "RotarySelector";
private static final boolean DBG = false; private static final boolean DBG = false;
private static final boolean VISUAL_DEBUG = false;
// Listener for onDialTrigger() callbacks. // Listener for onDialTrigger() callbacks.
private OnDialTriggerListener mOnDialTriggerListener; private OnDialTriggerListener mOnDialTriggerListener;
@ -290,10 +291,12 @@ public class RotarySelector extends View {
final int width = getWidth(); final int width = getWidth();
// DEBUG: draw bounding box around widget if (VISUAL_DEBUG) {
// mPaint.setColor(Color.RED); // draw bounding box around widget
// mPaint.setStyle(Paint.Style.STROKE); mPaint.setColor(0xffff0000);
// canvas.drawRect(0, 0, width, getHeight(), mPaint); mPaint.setStyle(Paint.Style.STROKE);
canvas.drawRect(0, 0, width, getHeight(), mPaint);
}
final int height = getHeight(); final int height = getHeight();
@ -336,21 +339,18 @@ public class RotarySelector extends View {
final int bgTop = isHoriz() ? final int bgTop = isHoriz() ?
height - bgHeight: height - bgHeight:
width - bgHeight; width - bgHeight;
// DEBUG: draw circle bounding arc drawable: good sanity check we're doing the math
// correctly
// float or = OUTER_ROTARY_RADIUS_DIP * mDensity;
// final int vOffset = mBackgroundWidth - height;
// final int midX = isHoriz() ?
// width / 2 :
// mBackgroundWidth / 2 - vOffset;
// if (isHoriz()) {
// canvas.drawCircle(midX, or + bgTop, or, mPaint);
// } else {
// canvas.drawCircle(or + bgTop, midX, or, mPaint);
// }
// dimple selection if (VISUAL_DEBUG) {
Bitmap dimpleBitmap = mGrabbedState == NOTHING_GRABBED ? mDimple : mDimpleDim; // draw circle bounding arc drawable: good sanity check we're doing the math correctly
float or = OUTER_ROTARY_RADIUS_DIP * mDensity;
final int vOffset = mBackgroundWidth - height;
final int midX = isHoriz() ? width / 2 : mBackgroundWidth / 2 - vOffset;
if (isHoriz()) {
canvas.drawCircle(midX, or + bgTop, or, mPaint);
} else {
canvas.drawCircle(or + bgTop, midX, or, mPaint);
}
}
// left dimple / icon // left dimple / icon
{ {
@ -360,17 +360,13 @@ public class RotarySelector extends View {
mInnerRadius, mInnerRadius,
mOuterRadius, mOuterRadius,
xOffset); xOffset);
if (isHoriz()) { final int x = isHoriz() ? xOffset : drawableY + bgTop;
drawCentered(dimpleBitmap, canvas, xOffset, drawableY + bgTop); final int y = isHoriz() ? drawableY + bgTop : height - xOffset;
if (mGrabbedState != RIGHT_HANDLE_GRABBED) { if (mGrabbedState != RIGHT_HANDLE_GRABBED) {
drawCentered(mLeftHandleIcon, canvas, xOffset, drawableY + bgTop); drawCentered(mDimple, canvas, x, y);
} drawCentered(mLeftHandleIcon, canvas, x, y);
} else { } else {
// vertical drawCentered(mDimpleDim, canvas, x, y);
drawCentered(dimpleBitmap, canvas, drawableY + bgTop, height - xOffset);
if (mGrabbedState != RIGHT_HANDLE_GRABBED) {
drawCentered(mLeftHandleIcon, canvas, drawableY + bgTop, height - xOffset);
}
} }
} }
@ -386,10 +382,10 @@ public class RotarySelector extends View {
xOffset); xOffset);
if (isHoriz()) { if (isHoriz()) {
drawCentered(dimpleBitmap, canvas, xOffset, drawableY + bgTop); drawCentered(mDimpleDim, canvas, xOffset, drawableY + bgTop);
} else { } else {
// vertical // vertical
drawCentered(dimpleBitmap, canvas, drawableY + bgTop, height - xOffset); drawCentered(mDimpleDim, canvas, drawableY + bgTop, height - xOffset);
} }
} }
@ -402,17 +398,13 @@ public class RotarySelector extends View {
mOuterRadius, mOuterRadius,
xOffset); xOffset);
if (isHoriz()) { final int x = isHoriz() ? xOffset : drawableY + bgTop;
drawCentered(dimpleBitmap, canvas, xOffset, drawableY + bgTop); final int y = isHoriz() ? drawableY + bgTop : height - xOffset;
if (mGrabbedState != LEFT_HANDLE_GRABBED) { if (mGrabbedState != LEFT_HANDLE_GRABBED) {
drawCentered(mRightHandleIcon, canvas, xOffset, drawableY + bgTop); drawCentered(mDimple, canvas, x, y);
} drawCentered(mRightHandleIcon, canvas, x, y);
} else { } else {
// vertical drawCentered(mDimpleDim, canvas, x, y);
drawCentered(dimpleBitmap, canvas, drawableY + bgTop, height - xOffset);
if (mGrabbedState != LEFT_HANDLE_GRABBED) {
drawCentered(mRightHandleIcon, canvas, drawableY + bgTop, height - xOffset);
}
} }
} }
@ -427,9 +419,9 @@ public class RotarySelector extends View {
dimpleLeft); dimpleLeft);
if (isHoriz()) { if (isHoriz()) {
drawCentered(dimpleBitmap, canvas, dimpleLeft, drawableY + bgTop); drawCentered(mDimpleDim, canvas, dimpleLeft, drawableY + bgTop);
} else { } else {
drawCentered(dimpleBitmap, canvas, drawableY + bgTop, height - dimpleLeft); drawCentered(mDimpleDim, canvas, drawableY + bgTop, height - dimpleLeft);
} }
dimpleLeft -= mDimpleSpacing; dimpleLeft -= mDimpleSpacing;
} }
@ -445,9 +437,9 @@ public class RotarySelector extends View {
dimpleRight); dimpleRight);
if (isHoriz()) { if (isHoriz()) {
drawCentered(dimpleBitmap, canvas, dimpleRight, drawableY + bgTop); drawCentered(mDimpleDim, canvas, dimpleRight, drawableY + bgTop);
} else { } else {
drawCentered(dimpleBitmap, canvas, drawableY + bgTop, height - dimpleRight); drawCentered(mDimpleDim, canvas, drawableY + bgTop, height - dimpleRight);
} }
dimpleRight += mDimpleSpacing; dimpleRight += mDimpleSpacing;
} }