diff options
author | Insun Kang <insun@google.com> | 2019-11-18 14:50:19 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-18 14:50:19 -0800 |
commit | 4e72d86717bddb92673c759d3cc1c7c573cd79de (patch) | |
tree | 29ccf285022f908dd3fb45701afec2138f3e8071 | |
parent | 427f305c037f0ab66c7a067a4e2ee354b0105a91 (diff) | |
parent | 862df2153852cfe6aa76f731be0fcb5577dca630 (diff) | |
download | UniversalMediaPlayer-4e72d86717bddb92673c759d3cc1c7c573cd79de.tar.gz |
Apply androidx.media2.* library/package separation to pump app
am: 862df21538
Change-Id: I879990fe5dc530ef326010b78346e6415a7b31a1
-rw-r--r-- | java/com/android/pump/activity/AudioPlayerActivity.java | 2 | ||||
-rw-r--r-- | java/com/android/pump/activity/VideoPlayerActivity.java | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/java/com/android/pump/activity/AudioPlayerActivity.java b/java/com/android/pump/activity/AudioPlayerActivity.java index dc36bc2..d55d286 100644 --- a/java/com/android/pump/activity/AudioPlayerActivity.java +++ b/java/com/android/pump/activity/AudioPlayerActivity.java @@ -27,7 +27,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.appcompat.app.AppCompatActivity; -import androidx.media2.UriMediaItem; +import androidx.media2.common.UriMediaItem; import androidx.media2.widget.VideoView; import com.android.pump.R; diff --git a/java/com/android/pump/activity/VideoPlayerActivity.java b/java/com/android/pump/activity/VideoPlayerActivity.java index b2c1d08..1e75c40 100644 --- a/java/com/android/pump/activity/VideoPlayerActivity.java +++ b/java/com/android/pump/activity/VideoPlayerActivity.java @@ -27,11 +27,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.appcompat.app.AppCompatActivity; -import androidx.media2.MediaController; -import androidx.media2.MediaItem; -import androidx.media2.SessionPlayer; -import androidx.media2.SessionToken; -import androidx.media2.UriMediaItem; +import androidx.media2.common.MediaItem; +import androidx.media2.common.SessionPlayer; +import androidx.media2.common.UriMediaItem; +import androidx.media2.session.MediaController; +import androidx.media2.session.SessionToken; import androidx.media2.widget.VideoView; import com.android.pump.R; @@ -86,8 +86,10 @@ public class VideoPlayerActivity extends AppCompatActivity { public void onAttachedToWindow() { if (mMediaController == null) { SessionToken token = mVideoView.getSessionToken(); - mMediaController = new MediaController(this, token, Executors.uiThreadExecutor(), - new ControllerCallback()); + mMediaController = new MediaController.Builder(this) + .setSessionToken(token) + .setControllerCallback(Executors.uiThreadExecutor(), new ControllerCallback()) + .build(); } } |