summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Dai <sdai@google.com>2018-05-22 17:40:35 -0700
committerSimon Dai <sdai@google.com>2018-05-24 23:19:11 +0000
commit1d91bfeb449b010026e387d53e1cd6a4c9818013 (patch)
tree3ef8af3204706d64c7eed8a6a958bdb83c79b4e9
parent5bd74e71c5f11a9e14f3746cf3afbbabc810ee6c (diff)
downloadsystemlibs-1d91bfeb449b010026e387d53e1cd6a4c9818013.tar.gz
Add ContentStyle to media, implement with radio
Allows media apps to specify how their content is displayed (via grids or as list) Use the same extras that Gearhead is already using. Bug: 77646944 Test: Manual (built and tested both radio/media apps) Change-Id: I3c82bd044fa19e4aceef151202982373c7046078 Merged-In: I3c82bd044fa19e4aceef151202982373c7046078
-rw-r--r--car-broadcastradio-support/Android.mk3
-rw-r--r--car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java6
2 files changed, 8 insertions, 1 deletions
diff --git a/car-broadcastradio-support/Android.mk b/car-broadcastradio-support/Android.mk
index 3184f72..11b01ae 100644
--- a/car-broadcastradio-support/Android.mk
+++ b/car-broadcastradio-support/Android.mk
@@ -31,6 +31,7 @@ LOCAL_PROGUARD_ENABLED := disabled
LOCAL_USE_AAPT2 := true
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v4
+ android-support-v4 \
+ car-media-common
include $(BUILD_STATIC_JAVA_LIBRARY)
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 ebfd8ba..6687476 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
@@ -39,6 +39,7 @@ 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;
@@ -152,6 +153,11 @@ public class BrowseTree {
String mediaId, String title, boolean isPlayable, long folderType) {
Bundle 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();