Add a new way to pass data into the app via adb.

Originally there was only a set of extras that could be specified on the
command line to set the package name, media browser component, and pass
in a URI, search, or media ID.

I've updated it to allow passing in the package name and a query
that the developer may want to execute, and I've done it via a 'deep
link' type of structure. I hope this will make it relatively easy for
developers to use, and won't require using very short names for extras,
which is typically not recommended best practice.

If developers require the ability to pass in complex URIs (with
multiple parameters) then they can fall back to an updated set of extras
that follow recommended best practices in their naming.

Change-Id: Ic6df65e9350d430e7fd9204ad4c458b117b1a300

Author: nic0lette

README.md

@@ -29,9 +29,34 @@ Usage
    background, if provided.
 5. Press ```back``` to return to the list of media apps.
 
+Via ADB
+-------
+
+It's also possible to launch the app via ADB and the Activity manager (am).
+
+Usage: ```adb shell am start mediacontroller://?[search|id|uri=]```
+
+For example, to set up to play "Awakening" by _Silent Partner_ in UAMP, the following command
+could be used:
+
+```adb shell am start "mediacontroller://com.example.android.uamp?id=__BY_GENRE__/Rock\|-1679589699"```
+
+Alternatively, it's possible to use extras to pass parameters, which is recommended when passing
+parameters that include URI-like components:
+
+Extra names:
+
+- Package name : ```com.example.android.mediacontroller.PACKAGE_NAME```
+- Search term : ```com.example.android.mediacontroller.SEARCH```
+- Media ID : ```com.example.android.mediacontroller.MEDIA_ID```
+- URI : ```com.example.android.mediacontroller.URI```
+
+Another example with UAMP is to perform a search with the term "jazz?" one would use:
+
+```adb shell am start -n com.example.android.mediacontroller/.MediaAppControllerActivity --es com.example.android.mediacontroller.PACKAGE_NAME "com.example.android.uamp" --es com.example.android.mediacontroller.SEARCH "jazz?"```
 
 Screenshots
------------
+===========
 
 ![](screenshots/screenshots.png "Controls, URIs, Playback")
 

mediacontroller/src/main/AndroidManifest.xml

@@ -34,7 +34,18 @@
 
         <activity
             android:name=".MediaAppControllerActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data
+                    android:scheme="mediacontroller" />
+            intent-filter>
+        activity>
 
     application>
 

mediacontroller/src/main/java/com/example/android/mediacontroller/LaunchActivity.java

@@ -23,6 +23,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.media.MediaBrowserServiceCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.util.DiffUtil;
 import android.support.v7.widget.LinearLayoutManager;
@@ -44,7 +45,6 @@
  * (via a receiver that responds to the action "android.media.browse.MediaBrowserService").
  */
 public class LaunchActivity extends AppCompatActivity {
-
     /**
      * Callback used by {@link FindMediaAppsTask}.
      */
@@ -116,9 +116,6 @@ protected void onStart() {
     }
 
     private class FindMediaAppsTask extends AsyncTask<Void, Void, List<MediaAppDetails>> {
-        private static final String MEDIA_BROWSER_ACTION =
-                "android.media.browse.MediaBrowserService";
-
         private final AppListUpdatedCallback mCallback;
 
         private FindMediaAppsTask(@NonNull AppListUpdatedCallback callback) {
@@ -140,7 +137,8 @@ protected List doInBackground(Void... params) {
             // Build an Intent that only has the MediaBrowserService action and query
             // the PackageManager for apps that have services registered that can
             // receive it.
-            final Intent mediaBrowserIntent = new Intent(MEDIA_BROWSER_ACTION);
+            final Intent mediaBrowserIntent =
+                    new Intent(MediaBrowserServiceCompat.SERVICE_INTERFACE);
             final List<ResolveInfo> services =
                     packageManager.queryIntentServices(mediaBrowserIntent,
                             PackageManager.GET_RESOLVED_FILTER);

mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppControllerActivity.java

@@ -16,17 +16,23 @@
 package com.example.android.mediacontroller;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.media.MediaBrowserCompat;
+import android.support.v4.media.MediaBrowserServiceCompat;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
@@ -37,17 +43,18 @@
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * This class connects to a {@link android.support.v4.media.MediaBrowserServiceCompat}
@@ -68,10 +75,30 @@ public class MediaAppControllerActivity extends AppCompatActivity {
     private static final String STATE_URI_KEY =
             "com.example.android.mediacontroller.STATE_URI_KEY";
 
+    // Key names for external extras.
+    private static final String PACKAGE_NAME_EXTRA =
+            "com.example.android.mediacontroller.PACKAGE_NAME";
+    private static final String SEARCH_EXTRA = "com.example.android.mediacontroller.SEARCH";
+    private static final String URI_EXTRA ="com.example.android.mediacontroller.URI";
+    private static final String MEDIA_ID_EXTRA = "com.example.android.mediacontroller.MEDIA_ID";
+
+    // Hint to use the currently loaded app rather than specifying a package.
+    private static final String CURRENT_PACKAGE = "current";
+
+    // Parameters for deep link URI.
+    private static final String SEARCH_PARAM = "search";
+    private static final String MEDIA_ID_PARAM = "id";
+    private static final String URI_PARAM = "uri";
+
     // Key name for Intent extras.
     private static final String APP_DETAILS_EXTRA =
             "com.example.android.mediacontroller.APP_DETAILS_EXTRA";
 
+    // Index values for spinner.
+    private static final int SEARCH_INDEX = 0;
+    private static final int MEDIA_ID_INDEX = 1;
+    private static final int URI_INDEX = 2;
+
     private MediaAppDetails mMediaAppDetails;
     private MediaControllerCompat mController;
     private MediaBrowserCompat mBrowser;
@@ -94,7 +121,7 @@ public class MediaAppControllerActivity extends AppCompatActivity {
      * @return An Intent that can be used to start the Activity.
      */
     public static Intent buildIntent(final Activity activity,
-            final MediaAppDetails appDetails) {
+                                     final MediaAppDetails appDetails) {
         final Intent intent = new Intent(activity, MediaAppControllerActivity.class);
         intent.putExtra(APP_DETAILS_EXTRA, appDetails);
         return intent;
@@ -172,14 +199,65 @@ private void handleIntent(Intent intent) {
             return;
         }
 
-        if (intent.getData() != null) {
-            String uri = intent.getData().toString();
-            mUriInput.setText(uri);
+        final Uri data = intent.getData();
+        final String appPackageName;
+        if (data != null) {
+            appPackageName = data.getHost();
+
+            final Set<String> params = data.getQueryParameterNames();
+            if (params.contains(SEARCH_PARAM)) {
+                mInputTypeView.setSelection(SEARCH_INDEX);
+                mUriInput.setText(data.getQueryParameter(SEARCH_PARAM));
+            } else if (params.contains(MEDIA_ID_PARAM)) {
+                mInputTypeView.setSelection(MEDIA_ID_INDEX);
+                mUriInput.setText(data.getQueryParameter(MEDIA_ID_PARAM));
+            } else if (params.contains(URI_PARAM)) {
+                mInputTypeView.setSelection(URI_INDEX);
+                mUriInput.setText(data.getQueryParameter(URI_PARAM));
+            }
+        } else if (intent.hasExtra(PACKAGE_NAME_EXTRA)) {
+            appPackageName = intent.getStringExtra(PACKAGE_NAME_EXTRA);
+        } else {
+            appPackageName = null;
+        }
+
+        // Create app details from URI, if one was present.
+        if (appPackageName != null) {
+            if (mMediaAppDetails == null || !appPackageName.equals(CURRENT_PACKAGE)) {
+                final MediaAppDetails appDetails = buildMediaDetailsFromPackage(appPackageName);
+
+                if (appDetails == null) {
+                    // Couldn't build the media app details so alert the user and exit.
+                    Toast.makeText(this,
+                            getString(R.string.no_app_for_package, appPackageName),
+                            Toast.LENGTH_LONG)
+                            .show();
+                    finish();
+                    return;
+                } else {
+                    mMediaAppDetails = appDetails;
+                }
+            }
         }
 
         final Bundle extras = intent.getExtras();
-        if (extras != null && extras.containsKey(APP_DETAILS_EXTRA)) {
-            mMediaAppDetails = extras.getParcelable(APP_DETAILS_EXTRA);
+        if (extras != null) {
+            // Pull data out of the extras, if they're there.
+            if (extras.containsKey(SEARCH_EXTRA)) {
+                mInputTypeView.setSelection(SEARCH_INDEX);
+                mUriInput.setText(extras.getString(SEARCH_EXTRA));
+            } else if (extras.containsKey(MEDIA_ID_EXTRA)) {
+                mInputTypeView.setSelection(MEDIA_ID_INDEX);
+                mUriInput.setText(extras.getString(MEDIA_ID_EXTRA));
+            } else if (extras.containsKey(URI_EXTRA)) {
+                mInputTypeView.setSelection(URI_INDEX);
+                mUriInput.setText(extras.getString(URI_EXTRA));
+            }
+
+            // It's also possible we're here from LaunchActivity, which did all this work for us.
+            if (extras.containsKey(APP_DETAILS_EXTRA)) {
+                mMediaAppDetails = extras.getParcelable(APP_DETAILS_EXTRA);
+            }
         }
     }
 
@@ -211,6 +289,31 @@ private void setupMediaController() {
         mBrowser.connect();
     }
 
+    private MediaAppDetails buildMediaDetailsFromPackage(final String packageName) {
+        final PackageManager packageManager = getPackageManager();
+
+        final Intent mediaBrowserIntent = new Intent(MediaBrowserServiceCompat.SERVICE_INTERFACE);
+        final List<ResolveInfo> services =
+                packageManager.queryIntentServices(mediaBrowserIntent,
+                        PackageManager.GET_RESOLVED_FILTER);
+        for (ResolveInfo info : services) {
+            if (info.serviceInfo.packageName.equals(packageName)) {
+                final Drawable icon = info.loadIcon(packageManager);
+                final String name = info.loadLabel(packageManager).toString();
+                final String serviceName = info.serviceInfo.name;
+                final ComponentName serviceComponentName =
+                        new ComponentName(packageName, serviceName);
+                return new MediaAppDetails(
+                        name,
+                        serviceComponentName,
+                        BitmapUtils.convertDrawable(getResources(), icon));
+            }
+        }
+
+        // Failed to find package.
+        return null;
+    }
+
     private void setupButtons() {
 
         final PreparePlayHandler preparePlayHandler = new PreparePlayHandler(this);

mediacontroller/src/main/res/values/strings.xml

@@ -19,6 +19,7 @@
     <string name="app_icon_desc">App icon for %1$s.string>
     <string name="no_apps_found">No Media Apps Foundstring>
     <string name="no_apps_details">Could not locate any apps implementing a MediaBrowser.string>
+    <string name="no_app_for_package">Could not find a media browser for package "%1$s".string>
 
     <string name="monkey_buttons_txt">PUSH BUTTONS!string>
     <string name="default_pkg">com.example.android.uampstring>