am 3da1568: Merge "Update to follow TransportMediator API changes." into jb-mr2-dev

* commit '3da1568ae86f49fbe9f239e0e4f6d0389e4bacd7':
  Update to follow TransportMediator API changes.

Author: Dianne Hackborn

samples/Support4Demos/src/com/example/android/supportv4/media/MediaController.java

@@ -216,12 +216,12 @@ private String stringForTime(int timeMs) {
         }
     }
 
-    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 int updateProgress() {
         }
 
         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 void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
 
     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 void onClick(View v) {
 
     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();

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() {