summaryrefslogtreecommitdiffstats
path: root/tests/MusicServiceDemo
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-08-28 16:23:43 -0700
committerErik Pasternak <roboerik@android.com>2014-08-28 23:37:22 +0000
commit6a6a8f00946f963191612f64238bd706c2188dd8 (patch)
tree9672e8d9df690bf49fe63c9ddd71daadec6e3f73 /tests/MusicServiceDemo
parentd6b03eecf05441b28272e11a4e50177a0fbc78c7 (diff)
downloadframeworks_base-6a6a8f00946f963191612f64238bd706c2188dd8.zip
frameworks_base-6a6a8f00946f963191612f64238bd706c2188dd8.tar.gz
frameworks_base-6a6a8f00946f963191612f64238bd706c2188dd8.tar.bz2
Fix test build
Updates for MediaBrowser APIs. I missed some new demos that had been added which use these APIs. Change-Id: Ic42c9ba20a851c5b08c564cfc4de71bbe09ebdb9
Diffstat (limited to 'tests/MusicServiceDemo')
-rw-r--r--tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java28
1 files changed, 13 insertions, 15 deletions
diff --git a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java
index 937f1e6..845db6c 100644
--- a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java
+++ b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java
@@ -25,13 +25,14 @@ import android.content.res.Resources.NotFoundException;
import android.database.MatrixCursor;
import android.graphics.Bitmap;
import android.media.AudioManager;
+import android.media.MediaDescription;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnPreparedListener;
-import android.media.browse.MediaBrowserItem;
-import android.media.browse.MediaBrowserService;
-import android.media.browse.MediaBrowserService.BrowserRoot;
+import android.media.browse.MediaBrowser;
+import android.service.media.MediaBrowserService;
+import android.service.media.MediaBrowserService.BrowserRoot;
import android.media.session.MediaSession;
import android.net.Uri;
import android.net.wifi.WifiManager;
@@ -122,17 +123,19 @@ public class BrowserService extends MediaBrowserService {
@Override
public void onLoadChildren(final Uri parentUri,
- final Result<List<MediaBrowserItem>> result) {
+ final Result<List<MediaBrowser.MediaItem>> result) {
new Handler().postDelayed(new Runnable() {
public void run() {
- final ArrayList<MediaBrowserItem> list = new ArrayList();
+ final ArrayList<MediaBrowser.MediaItem> list = new ArrayList();
for (int i=0; i<10; i++) {
- list.add(new MediaBrowserItem.Builder(
- Uri.withAppendedPath(BASE_URI, Integer.toString(i)),
- MediaBrowserItem.FLAG_BROWSABLE, "Title " + i)
- .setSummary("Summary " + i)
- .build());
+ MediaDescription.Builder bob = new MediaDescription.Builder();
+ bob.setTitle("Title " + i);
+ bob.setSubtitle("Summary " + i);
+ bob.setMediaId(Uri.withAppendedPath(BASE_URI,
+ Integer.toString(i)).toString());
+ list.add(new MediaBrowser.MediaItem(MediaBrowser.MediaItem.FLAG_BROWSABLE,
+ bob.build()));
}
result.sendResult(list);
@@ -141,11 +144,6 @@ public class BrowserService extends MediaBrowserService {
result.detach();
}
- @Override
- public void onLoadIcon(Uri uri, int width, int height, Result<Bitmap> result) {
- result.sendResult(null);
- }
-
/*
@Override
public void query(final Query query, final IMetadataResultHandler metadataResultHandler,