Merge change 25297 into eclair (82df16c6) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/RotarySelector.java

+79 −74

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,6 @@ package com.android.internal.widget;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.graphics.Canvas;		import android.graphics.Canvas;
	import android.graphics.Paint;
	import android.graphics.Color;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.os.Vibrator;		import android.os.Vibrator;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	@@ -28,7 +26,7 @@ import android.util.Log;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	import android.view.View;		import android.view.View;
	import android.view.animation.AccelerateInterpolator;		import android.view.animation.AccelerateInterpolator;
			import static android.view.animation.AnimationUtils.currentAnimationTimeMillis;
	import com.android.internal.R;		import com.android.internal.R;


	@@ -69,7 +67,7 @@ public class RotarySelector extends View {
	private boolean mAnimating = false;		private boolean mAnimating = false;
	private long mAnimationEndTime;		private long mAnimationEndTime;
	private int mAnimatingDelta;		private int mAnimatingDelta;
	AccelerateInterpolator mInterpolator;		private AccelerateInterpolator mInterpolator;

	/**		/**
	* True after triggering an action if the user of {@link OnDialTriggerListener} wants to		* True after triggering an action if the user of {@link OnDialTriggerListener} wants to
	@@ -96,12 +94,6 @@ public class RotarySelector extends View {
	private static final long VIBRATE_SHORT = 60; // msec		private static final long VIBRATE_SHORT = 60; // msec
	private static final long VIBRATE_LONG = 100; // msec		private static final long VIBRATE_LONG = 100; // msec

	// Various tweakable layout or behavior parameters:

	// How close to the edge of the screen, we let the handle get before
	// triggering an action:
	private static final int EDGE_THRESHOLD_DIP = 70;

	/**		/**
	* The drawable for the arrows need to be scrunched this many dips towards the rotary bg below		* The drawable for the arrows need to be scrunched this many dips towards the rotary bg below
	* it.		* it.
	@@ -122,6 +114,11 @@ public class RotarySelector extends View {

	private static final boolean DRAW_CENTER_DIMPLE = false;		private static final boolean DRAW_CENTER_DIMPLE = false;

			public RotarySelector(Context context) {
			this(context, null);
			}


	/**		/**
	* Constructor used when this widget is created from a layout file.		* Constructor used when this widget is created from a layout file.
	*/		*/
	@@ -132,8 +129,6 @@ public class RotarySelector extends View {
	Resources r = getResources();		Resources r = getResources();
	mDensity = r.getDisplayMetrics().density;		mDensity = r.getDisplayMetrics().density;
	if (DBG) log("- Density: " + mDensity);		if (DBG) log("- Density: " + mDensity);
	// Density is 1.0 on HVGA (like Dream), and 1.5 on WVGA.
	// Usage: raw_pixel_value = (int) (dpi_value * mDensity + 0.5f)

	// Assets (all are BitmapDrawables).		// Assets (all are BitmapDrawables).
	mBackground = r.getDrawable(R.drawable.jog_dial_bg_cropped);		mBackground = r.getDrawable(R.drawable.jog_dial_bg_cropped);
	@@ -143,6 +138,15 @@ public class RotarySelector extends View {
	mArrowLongRight = r.getDrawable(R.drawable.jog_dial_arrow_long_right_red);		mArrowLongRight = r.getDrawable(R.drawable.jog_dial_arrow_long_right_red);
	mArrowShortLeftAndRight = r.getDrawable(R.drawable.jog_dial_arrow_short_left_and_right);		mArrowShortLeftAndRight = r.getDrawable(R.drawable.jog_dial_arrow_short_left_and_right);

			// Arrows:
			// All arrow assets are the same size (they're the full width of
			// the screen) regardless of which arrows are actually visible.
			int arrowW = mArrowShortLeftAndRight.getIntrinsicWidth();
			int arrowH = mArrowShortLeftAndRight.getIntrinsicHeight();
			mArrowShortLeftAndRight.setBounds(0, 0, arrowW, arrowH);
			mArrowLongLeft.setBounds(0, 0, arrowW, arrowH);
			mArrowLongRight.setBounds(0, 0, arrowW, arrowH);

	mInterpolator = new AccelerateInterpolator();		mInterpolator = new AccelerateInterpolator();
	}		}

	@@ -237,7 +241,7 @@ public class RotarySelector extends View {

	// update animating state before we draw anything		// update animating state before we draw anything
	if (mAnimating && !mFrozen) {		if (mAnimating && !mFrozen) {
	long millisLeft = mAnimationEndTime - System.currentTimeMillis();		long millisLeft = mAnimationEndTime - currentAnimationTimeMillis();
	if (DBG) log("millisleft for animating: " + millisLeft);		if (DBG) log("millisleft for animating: " + millisLeft);
	if (millisLeft <= 0) {		if (millisLeft <= 0) {
	reset();		reset();
	@@ -259,11 +263,6 @@ public class RotarySelector extends View {
	if (DBG) log(" Background BOUNDS: " + mBackground.getBounds());		if (DBG) log(" Background BOUNDS: " + mBackground.getBounds());
	mBackground.draw(canvas);		mBackground.draw(canvas);

	// Arrows:
	// All arrow assets are the same size (they're the full width of
	// the screen) regardless of which arrows are actually visible.
	int arrowW = mArrowShortLeftAndRight.getIntrinsicWidth();
	int arrowH = mArrowShortLeftAndRight.getIntrinsicHeight();

	// Draw the correct arrow(s) depending on the current state:		// Draw the correct arrow(s) depending on the current state:
	Drawable currentArrow;		Drawable currentArrow;
	@@ -280,7 +279,6 @@ public class RotarySelector extends View {
	default:		default:
	throw new IllegalStateException("invalid mGrabbedState: " + mGrabbedState);		throw new IllegalStateException("invalid mGrabbedState: " + mGrabbedState);
	}		}
	currentArrow.setBounds(0, 0, arrowW, arrowH);
	currentArrow.draw(canvas);		currentArrow.draw(canvas);

	// debug: draw circle that should match the outer arc (good sanity check)		// debug: draw circle that should match the outer arc (good sanity check)
	@@ -382,34 +380,38 @@ public class RotarySelector extends View {
	final int eventX = (int) event.getX();		final int eventX = (int) event.getX();
	final int hitWindow = mDimple.getIntrinsicWidth();		final int hitWindow = mDimple.getIntrinsicWidth();

	if (event.getAction() == MotionEvent.ACTION_DOWN) {		final int action = event.getAction();
			switch (action) {
			case MotionEvent.ACTION_DOWN:
	if (DBG) log("touch-down");		if (DBG) log("touch-down");
	mTriggered = false;		mTriggered = false;
	if (mGrabbedState != RotarySelector.NOTHING_GRABBED) {		if (mGrabbedState != NOTHING_GRABBED) {
	reset();		reset();
	invalidate();		invalidate();
	}		}
	if (eventX < mLeftHandleX + hitWindow) {		if (eventX < mLeftHandleX + hitWindow) {
	mTouchDragOffset = eventX - mLeftHandleX;		mTouchDragOffset = eventX - mLeftHandleX;
	mGrabbedState = RotarySelector.LEFT_HANDLE_GRABBED;		mGrabbedState = LEFT_HANDLE_GRABBED;
	invalidate();		invalidate();
	vibrate(VIBRATE_SHORT);		vibrate(VIBRATE_SHORT);
	} else if (eventX > mRightHandleX - hitWindow) {		} else if (eventX > mRightHandleX - hitWindow) {
	mTouchDragOffset = eventX - mRightHandleX;		mTouchDragOffset = eventX - mRightHandleX;
	mGrabbedState = RotarySelector.RIGHT_HANDLE_GRABBED;		mGrabbedState = RIGHT_HANDLE_GRABBED;
	invalidate();		invalidate();
	vibrate(VIBRATE_SHORT);		vibrate(VIBRATE_SHORT);
	}		}
	} else if (event.getAction() == MotionEvent.ACTION_MOVE) {		break;

			case MotionEvent.ACTION_MOVE:
	if (DBG) log("touch-move");		if (DBG) log("touch-move");
	if (mGrabbedState == RotarySelector.LEFT_HANDLE_GRABBED) {		if (mGrabbedState == LEFT_HANDLE_GRABBED) {
	mTouchDragOffset = eventX - mLeftHandleX;		mTouchDragOffset = eventX - mLeftHandleX;
	invalidate();		invalidate();
	if (eventX >= mRightHandleX - EDGE_PADDING_DIP && !mTriggered) {		if (eventX >= mRightHandleX - EDGE_PADDING_DIP && !mTriggered) {
	mTriggered = true;		mTriggered = true;
	mFrozen = dispatchTriggerEvent(OnDialTriggerListener.LEFT_HANDLE);		mFrozen = dispatchTriggerEvent(OnDialTriggerListener.LEFT_HANDLE);
	}		}
	} else if (mGrabbedState == RotarySelector.RIGHT_HANDLE_GRABBED) {		} else if (mGrabbedState == RIGHT_HANDLE_GRABBED) {
	mTouchDragOffset = eventX - mRightHandleX;		mTouchDragOffset = eventX - mRightHandleX;
	invalidate();		invalidate();
	if (eventX <= mLeftHandleX + EDGE_PADDING_DIP && !mTriggered) {		if (eventX <= mLeftHandleX + EDGE_PADDING_DIP && !mTriggered) {
	@@ -417,28 +419,31 @@ public class RotarySelector extends View {
	mFrozen = dispatchTriggerEvent(OnDialTriggerListener.RIGHT_HANDLE);		mFrozen = dispatchTriggerEvent(OnDialTriggerListener.RIGHT_HANDLE);
	}		}
	}		}
	} else if ((event.getAction() == MotionEvent.ACTION_UP)) {		break;
			case MotionEvent.ACTION_UP:
	if (DBG) log("touch-up");		if (DBG) log("touch-up");
	// handle animating back to start if they didn't trigger		// handle animating back to start if they didn't trigger
	if (mGrabbedState == RotarySelector.LEFT_HANDLE_GRABBED		if (mGrabbedState == LEFT_HANDLE_GRABBED
	&& Math.abs(eventX - mLeftHandleX) > 5) {		&& Math.abs(eventX - mLeftHandleX) > 5) {
	mAnimating = true;		mAnimating = true;
	mAnimationEndTime = System.currentTimeMillis() + ANIMATION_DURATION_MILLIS;		mAnimationEndTime = currentAnimationTimeMillis() + ANIMATION_DURATION_MILLIS;
	mAnimatingDelta = eventX - mLeftHandleX;		mAnimatingDelta = eventX - mLeftHandleX;
	} else if (mGrabbedState == RotarySelector.RIGHT_HANDLE_GRABBED		} else if (mGrabbedState == RIGHT_HANDLE_GRABBED
	&& Math.abs(eventX - mRightHandleX) > 5) {		&& Math.abs(eventX - mRightHandleX) > 5) {
	mAnimating = true;		mAnimating = true;
	mAnimationEndTime = System.currentTimeMillis() + ANIMATION_DURATION_MILLIS;		mAnimationEndTime = currentAnimationTimeMillis() + ANIMATION_DURATION_MILLIS;
	mAnimatingDelta = eventX - mRightHandleX;		mAnimatingDelta = eventX - mRightHandleX;
	}		}

	mTouchDragOffset = 0;		mTouchDragOffset = 0;
	mGrabbedState = RotarySelector.NOTHING_GRABBED;		mGrabbedState = NOTHING_GRABBED;
	invalidate();		invalidate();
	} else if (event.getAction() == MotionEvent.ACTION_CANCEL) {		break;
			case MotionEvent.ACTION_CANCEL:
	if (DBG) log("touch-cancel");		if (DBG) log("touch-cancel");
	reset();		reset();
	invalidate();		invalidate();
			break;
	}		}
	return true;		return true;
	}		}
	@@ -446,7 +451,7 @@ public class RotarySelector extends View {
	private void reset() {		private void reset() {
	mAnimating = false;		mAnimating = false;
	mTouchDragOffset = 0;		mTouchDragOffset = 0;
	mGrabbedState = RotarySelector.NOTHING_GRABBED;		mGrabbedState = NOTHING_GRABBED;
	mTriggered = false;		mTriggered = false;
	}		}