projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[tx-robot] updated from transifex
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
media
/
MediaControlView.java
diff --git
a/src/com/owncloud/android/media/MediaControlView.java
b/src/com/owncloud/android/media/MediaControlView.java
index
9db76df
..
9f48123
100644
(file)
--- a/
src/com/owncloud/android/media/MediaControlView.java
+++ b/
src/com/owncloud/android/media/MediaControlView.java
@@
-391,6
+391,7
@@
public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi
@Override
public void onClick(View v) {
int pos;
@Override
public void onClick(View v) {
int pos;
+ boolean playing = mPlayer.isPlaying();
switch (v.getId()) {
case R.id.playBtn:
switch (v.getId()) {
case R.id.playBtn:
@@
-401,6
+402,7
@@
public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi
pos = mPlayer.getCurrentPosition();
pos -= 5000;
mPlayer.seekTo(pos);
pos = mPlayer.getCurrentPosition();
pos -= 5000;
mPlayer.seekTo(pos);
+ if (!playing) mPlayer.pause(); // necessary in some 2.3.x devices
setProgress();
break;
setProgress();
break;
@@
-408,6
+410,7
@@
public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi
pos = mPlayer.getCurrentPosition();
pos += 15000;
mPlayer.seekTo(pos);
pos = mPlayer.getCurrentPosition();
pos += 15000;
mPlayer.seekTo(pos);
+ if (!playing) mPlayer.pause(); // necessary in some 2.3.x devices
setProgress();
break;
setProgress();
break;