Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 563efe4c: am 85f23210: Fix test build

Browse Source 
* commit '563efe4c598b5b0fb92c23343c90e68b3f76c01c':
  Fix test build
This commit is contained in:
RoboErik
2014-08-29 03:58:23 +00:00
committed by Android Git Automerger
parent 2db944fa30 9a0757db73
commit 1b6dc49e37
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java
View File

@@ -21,7 +21,7 @@ import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.media.browse.MediaBrowserService;
import android.service.media.MediaBrowserService;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction;

16
tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/BrowserListFragment.java
View File

@@ -22,8 +22,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.media.browse.MediaBrowser;
import android.media.browse.MediaBrowserItem;
import android.media.browse.MediaBrowserService;
import android.service.media.MediaBrowserService;
import android.os.Bundle;
import android.net.Uri;
import android.support.v4.app.FragmentActivity;
@@ -57,9 +56,9 @@ public class BrowserListFragment extends ListFragment {
private MediaBrowser mBrowser;
private static class Item {
final MediaBrowserItem media;
final MediaBrowser.MediaItem media;
Item(MediaBrowserItem m) {
Item(MediaBrowser.MediaItem m) {
this.media = m;
}
}
@@ -103,13 +102,13 @@ public class BrowserListFragment extends ListFragment {
final Item item = mItems.get(position);
Log.i("BrowserListFragment", "Item clicked: " + position + " -- "
+ mAdapter.getItem(position).media.getUri());
+ mAdapter.getItem(position).media.getDescription().getIconUri());
final BrowserListFragment fragment = new BrowserListFragment();
final Bundle args = new Bundle();
args.putParcelable(BrowserListFragment.ARG_COMPONENT, mComponent);
args.putParcelable(BrowserListFragment.ARG_URI, item.media.getUri());
args.putParcelable(BrowserListFragment.ARG_URI, item.media.getDescription().getIconUri());
fragment.setArguments(args);
getFragmentManager().beginTransaction()
@@ -130,7 +129,8 @@ public class BrowserListFragment extends ListFragment {
}
mBrowser.subscribe(mUri, new MediaBrowser.SubscriptionCallback() {
@Override
public void onChildrenLoaded(Uri parentUri, List<MediaBrowserItem> children) {
public void onChildrenLoaded(Uri parentUri,
List<MediaBrowser.MediaItem> children) {
Log.d(TAG, "onChildrenLoaded parentUri=" + parentUri
+ " children= " + children);
mItems.clear();
@@ -197,7 +197,7 @@ public class BrowserListFragment extends ListFragment {
final TextView tv = (TextView)convertView;
final Item item = mItems.get(position);
tv.setText(item.media.getTitle());
tv.setText(item.media.getDescription().getTitle());
return convertView;
}

28
tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java
View File

@@ -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,