norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Toggle playback on long click of CoverView

Browse Source
This commit is contained in:
Christopher Eby 2010-06-02 00:26:31 -05:00
parent d92c8a2638
commit 24f55f76f5
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/kreed/vanilla/CoverView.java
View File

@ -76,6 +76,10 @@ public final class CoverView extends View implements Handler.Callback {
private float mStartX;
private float mStartY;
private int mTentativeCover = -1;
/**
* Ignore the next pointer up event, for long presses.
*/
private boolean mIgnoreNextUp;
/**
* Constructor intended to be called by inflating from XML.
@ -212,6 +216,8 @@ public final class CoverView extends View implements Handler.Callback {
mVelocityTracker = VelocityTracker.obtain();
mVelocityTracker.addMovement(ev);
mHandler.removeMessages(MSG_LONG_CLICK);
float x = ev.getX();
int scrollX = getScrollX();
int width = getWidth();
@ -224,6 +230,8 @@ public final class CoverView extends View implements Handler.Callback {
mStartX = x;
mStartY = ev.getY();
mLastMotionX = x;
mHandler.sendEmptyMessageDelayed(MSG_LONG_CLICK, ViewConfiguration.getLongPressTimeout());
break;
case MotionEvent.ACTION_MOVE:
int deltaX = (int) (mLastMotionX - x);
@ -239,9 +247,14 @@ public final class CoverView extends View implements Handler.Callback {
scrollBy(Math.min(availableToScroll, deltaX), 0);
}
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_UP:
if (Math.abs(mStartX - x) + Math.abs(mStartY - ev.getY()) < 10) {
performClick();
// A long press was performed and thus the normal action should
// not be executed.
if (mIgnoreNextUp)
mIgnoreNextUp = false;
else
performClick();
} else {
VelocityTracker velocityTracker = mVelocityTracker;
velocityTracker.computeCurrentVelocity(250);
@ -408,6 +421,12 @@ public final class CoverView extends View implements Handler.Callback {
* respectively.
*/
static final int MSG_SET_SONG = 1;
/**
* Perform a long click.
*
* @see View#performLongClick()
*/
private static final int MSG_LONG_CLICK = 2;
public boolean handleMessage(Message message)
{
@ -418,6 +437,10 @@ public final class CoverView extends View implements Handler.Callback {
case MSG_SET_SONG:
ContextApplication.getService().setCurrentSong(message.arg1);
break;
case MSG_LONG_CLICK:
mIgnoreNextUp = true;
performLongClick();
break;
default:
return false;
}

13
src/org/kreed/vanilla/FullPlaybackActivity.java
View File

@ -37,7 +37,7 @@ import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.TextView;
public class FullPlaybackActivity extends PlaybackActivity implements SeekBar.OnSeekBarChangeListener {
public class FullPlaybackActivity extends PlaybackActivity implements SeekBar.OnSeekBarChangeListener, View.OnLongClickListener {
/**
* A Handler running on the UI thread, in contrast with mHandler which runs
* on a worker thread.
@ -64,6 +64,7 @@ public class FullPlaybackActivity extends PlaybackActivity implements SeekBar.On
mCoverView = (CoverView)findViewById(R.id.cover_view);
mCoverView.setOnClickListener(this);
mCoverView.setOnLongClickListener(this);
mCoverView.setupHandler(mLooper);
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
@ -277,6 +278,16 @@ public class FullPlaybackActivity extends PlaybackActivity implements SeekBar.On
}
}
public boolean onLongClick(View view)
{
if (view == mCoverView) {
mHandler.sendMessage(mHandler.obtainMessage(MSG_TOGGLE_FLAG, PlaybackService.FLAG_PLAYING, 0));
return true;
}
return false;
}
/**
* Update the seekbar progress with the current song progress. This must be
* called on the UI Handler.