Merge branch 'master' of github.com:googlesamples/android-media-controller

Change-Id: Iecceb66c5eacc8382744ad6d4851763ae7273c87

Author: nic0lette

build.gradle

@@ -19,11 +19,11 @@
 
 buildscript {
     ext {
-        app_compat_version = '1.1.0-alpha04'
+        app_compat_version = '1.1.0'
         constraint_layout_version = '1.1.3'
-        kotlin_version = '1.3.21'
-        leanback_version = '1.1.0-alpha01'
-        material_version = '1.1.0-alpha05'
+        kotlin_version = '1.3.50'
+        leanback_version = '1.1.0-alpha02'
+        material_version = '1.1.0-alpha10'
         support_lib_version = '1.0.0-beta01'
     }
 
@@ -32,7 +32,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 13 10:26:08 KST 2018
+#Thu Oct 03 15:14:52 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

mediacontroller/src/main/java/com/example/android/mediacontroller/TestUtils.kt

@@ -16,6 +16,7 @@
 package com.example.android.mediacontroller
 
 import android.os.Bundle
+import android.support.v4.media.MediaDescriptionCompat
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaControllerCompat
 import android.support.v4.media.session.MediaSessionCompat
@@ -27,6 +28,7 @@ import org.json.JSONObject
  */
 
 const val METADATA_KEY_PREFIX = "android.media.metadata."
+const val METADATA_EXTRA_KEY_PREFIX = "android.media.extra."
 
 // Title, Artist, and Duration seem to always be present for a given Media Item, so these
 // three Metadata Keys are used to identify unique Media Items
@@ -287,7 +289,12 @@ fun getMetadataKey(metadata: MediaMetadataCompat?, key: String): String {
             MediaMetadataCompat.METADATA_KEY_DISC_NUMBER,
             MediaMetadataCompat.METADATA_KEY_DURATION,
             MediaMetadataCompat.METADATA_KEY_NUM_TRACKS,
-            MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER
+            MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER,
+            MediaMetadataCompat.METADATA_KEY_DOWNLOAD_STATUS,
+            MediaMetadataCompat.METADATA_KEY_BT_FOLDER_TYPE,
+            MediaMetadataCompat.METADATA_KEY_ADVERTISEMENT,
+            MediaDescriptionCompat.EXTRA_DOWNLOAD_STATUS,
+            MediaDescriptionCompat.EXTRA_BT_FOLDER_TYPE
     )
     val bitmapValues = arrayOf(
             MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
@@ -327,6 +334,8 @@ fun formatMetadata(metadata: MediaMetadataCompat?): String {
     keys.forEach { key ->
         val label = if (key.startsWith(METADATA_KEY_PREFIX)) {
             "${key.substringAfter(METADATA_KEY_PREFIX)}:".padEnd(20, ' ')
+        } else if (key.startsWith(METADATA_EXTRA_KEY_PREFIX)) {
+            "extra.${key.substringAfter(METADATA_EXTRA_KEY_PREFIX)}:".padEnd(20, ' ')
         } else {
             "$key:".padEnd(20, ' ')
         }

mediacontroller/src/main/res/layout/media_browse_item.xml

@@ -27,7 +27,6 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/margin_small"
         android:scaleType="fitCenter"
-        android:tint="@color/text_dark"
         tools:ignore="ContentDescription" />
 
     <LinearLayout