Migrate broadcastradio and streamui to androidx

Remove radio dependency on media-commons library
since ContentStyle isn't needed anymore

Test: Manual (build/deploy w/ CarRadioApp)
Bug: 109663478

Change-Id: I20254bf7a7377a1899aca01cc960c891f5099da7
Merged-In: I20254bf7a7377a1899aca01cc960c891f5099da7

1 files changed, 4 insertions, 9 deletions

diff --git a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
index f898f18..10f5df8 100644
--- a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
+++ b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
@@ -27,19 +27,19 @@ import android.hardware.radio.RadioManager.BandDescriptor;
 import android.hardware.radio.RadioMetadata;
 import android.os.Bundle;
 import android.support.v4.media.MediaBrowserCompat.MediaItem;
-import android.support.v4.media.MediaBrowserServiceCompat;
-import android.support.v4.media.MediaBrowserServiceCompat.BrowserRoot;
-import android.support.v4.media.MediaBrowserServiceCompat.Result;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.util.Log;
 
+import androidx.media.MediaBrowserServiceCompat;
+import androidx.media.MediaBrowserServiceCompat.BrowserRoot;
+import androidx.media.MediaBrowserServiceCompat.Result;
+
 import com.android.car.broadcastradio.support.Program;
 import com.android.car.broadcastradio.support.R;
 import com.android.car.broadcastradio.support.platform.ImageResolver;
 import com.android.car.broadcastradio.support.platform.ProgramInfoExt;
 import com.android.car.broadcastradio.support.platform.ProgramSelectorExt;
 import com.android.car.broadcastradio.support.platform.RadioMetadataExt;
-import com.android.car.media.common.ContentStyleMediaConstants;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -176,11 +176,6 @@ public class BrowseTree {
             String mediaId, String title, boolean isPlayable, long folderType, Bundle extras) {
         if (extras == null) extras = new Bundle();
         extras.putLong(EXTRA_BCRADIO_FOLDER_TYPE, folderType);
-        extras.putBoolean(ContentStyleMediaConstants.CONTENT_STYLE_SUPPORTED, true);
-        extras.putInt(ContentStyleMediaConstants.CONTENT_STYLE_PLAYABLE_HINT,
-                ContentStyleMediaConstants.CONTENT_STYLE_LIST_ITEM_HINT_VALUE);
-        extras.putInt(ContentStyleMediaConstants.CONTENT_STYLE_BROWSABLE_HINT,
-                ContentStyleMediaConstants.CONTENT_STYLE_LIST_ITEM_HINT_VALUE);
 
         MediaDescriptionCompat desc = descBuilder
                 .setMediaId(mediaId).setTitle(title).setExtras(extras).build();