summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-04-18 18:26:18 -0700
committerDianne Hackborn <hackbod@google.com>2013-04-18 18:26:18 -0700
commit74c5bcff29959931c8a4b15e4afa613975a47f4c (patch)
treef6818312609b700093cacc4a534e29ef0e5bd599 /samples
parent43b9e5a83b6c9a8d0e62be2a316c81934c5d0e98 (diff)
downloadandroid_development-74c5bcff29959931c8a4b15e4afa613975a47f4c.tar.gz
android_development-74c5bcff29959931c8a4b15e4afa613975a47f4c.tar.bz2
android_development-74c5bcff29959931c8a4b15e4afa613975a47f4c.zip
Update to follow TransportMediator API changes.
Change-Id: Icedd0fbe15cf84ff4d3f0c59826f698e92138b47
Diffstat (limited to 'samples')
-rw-r--r--samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java14
-rw-r--r--samples/Support4Demos/src/com/example/android/supportv4/media/TransportControllerActivity.java8
2 files changed, 11 insertions, 11 deletions
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java b/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
index d7d513dcf..b8d99d4a4 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java
@@ -216,12 +216,12 @@ public class MediaController extends FrameLayout {
}
}
- public int updateProgress() {
+ public long updateProgress() {
if (mController == null || mDragging) {
return 0;
}
- int position = mController.getCurrentPosition();
- int duration = mController.getDuration();
+ long position = mController.getCurrentPosition();
+ long duration = mController.getDuration();
if (mProgress != null) {
if (duration > 0) {
// use long to avoid overflow
@@ -233,9 +233,9 @@ public class MediaController extends FrameLayout {
}
if (mEndTime != null)
- mEndTime.setText(stringForTime(duration));
+ mEndTime.setText(stringForTime((int)duration));
if (mCurrentTime != null)
- mCurrentTime.setText(stringForTime(position));
+ mCurrentTime.setText(stringForTime((int)position));
return position;
}
@@ -323,7 +323,7 @@ public class MediaController extends FrameLayout {
private View.OnClickListener mRewListener = new View.OnClickListener() {
public void onClick(View v) {
- int pos = mController.getCurrentPosition();
+ long pos = mController.getCurrentPosition();
pos -= 5000; // milliseconds
mController.seekTo(pos);
updateProgress();
@@ -332,7 +332,7 @@ public class MediaController extends FrameLayout {
private View.OnClickListener mFfwdListener = new View.OnClickListener() {
public void onClick(View v) {
- int pos = mController.getCurrentPosition();
+ long pos = mController.getCurrentPosition();
pos += 15000; // milliseconds
mController.seekTo(pos);
updateProgress();
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/media/TransportControllerActivity.java b/samples/Support4Demos/src/com/example/android/supportv4/media/TransportControllerActivity.java
index 29fc814d5..abb3c97b8 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/media/TransportControllerActivity.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/media/TransportControllerActivity.java
@@ -61,16 +61,16 @@ public class TransportControllerActivity extends Activity {
mContent.pause();
}
- @Override public int onGetDuration() {
+ @Override public long onGetDuration() {
return mContent.getDuration();
}
- @Override public int onGetCurrentPosition() {
+ @Override public long onGetCurrentPosition() {
return mContent.getCurrentPosition();
}
- @Override public void onSeekTo(int pos) {
- mContent.seekTo(pos);
+ @Override public void onSeekTo(long pos) {
+ mContent.seekTo((int)pos);
}
@Override public boolean onIsPlaying() {