aboutsummaryrefslogtreecommitdiff
path: root/TestMediaApp
diff options
context:
space:
mode:
Diffstat (limited to 'TestMediaApp')
-rw-r--r--TestMediaApp/assets/media_items/advanced.json2
-rw-r--r--TestMediaApp/assets/media_items/album_art/art_nodes.json2
-rw-r--r--TestMediaApp/assets/media_items/mixed.json2
-rw-r--r--TestMediaApp/assets/media_items/only_nodes.json2
-rw-r--r--TestMediaApp/src/com/android/car/media/testmediaapp/MediaKeys.java14
-rw-r--r--TestMediaApp/src/com/android/car/media/testmediaapp/TmaMediaItem.java4
6 files changed, 21 insertions, 5 deletions
diff --git a/TestMediaApp/assets/media_items/advanced.json b/TestMediaApp/assets/media_items/advanced.json
index a6befa3..45a18ef 100644
--- a/TestMediaApp/assets/media_items/advanced.json
+++ b/TestMediaApp/assets/media_items/advanced.json
@@ -39,7 +39,7 @@
},
{
"FLAGS": "browsable",
- "PLAYABLE_HINT": "GRID",
+ "BROWSABLE_HINT": "GRID_CATEGORY",
"METADATA": {
"MEDIA_ID": "advanced art nodes",
"DISPLAY_TITLE": "Album Art"
diff --git a/TestMediaApp/assets/media_items/album_art/art_nodes.json b/TestMediaApp/assets/media_items/album_art/art_nodes.json
index 974268b..692809f 100644
--- a/TestMediaApp/assets/media_items/album_art/art_nodes.json
+++ b/TestMediaApp/assets/media_items/album_art/art_nodes.json
@@ -1,6 +1,6 @@
{
"FLAGS": "browsable",
- "BROWSABLE_HINT": "LIST",
+ "BROWSABLE_HINT": "GRID_CATEGORY",
"METADATA": {
"MEDIA_ID": "album_art/art_nodes",
diff --git a/TestMediaApp/assets/media_items/mixed.json b/TestMediaApp/assets/media_items/mixed.json
index 7e04e85..34da9c9 100644
--- a/TestMediaApp/assets/media_items/mixed.json
+++ b/TestMediaApp/assets/media_items/mixed.json
@@ -1,7 +1,7 @@
{
"FLAGS": "browsable",
"PLAYABLE_HINT": "GRID",
- "BROWSABLE_HINT": "LIST",
+ "BROWSABLE_HINT": "LIST_CATEGORY",
"METADATA": {
"MEDIA_ID": "mixed",
diff --git a/TestMediaApp/assets/media_items/only_nodes.json b/TestMediaApp/assets/media_items/only_nodes.json
index a020abd..26f998e 100644
--- a/TestMediaApp/assets/media_items/only_nodes.json
+++ b/TestMediaApp/assets/media_items/only_nodes.json
@@ -32,7 +32,7 @@
{
"FLAGS": "browsable",
"PLAYABLE_HINT": "GRID",
- "BROWSABLE_HINT": "LIST",
+ "BROWSABLE_HINT": "LIST_CATEGORY",
"METADATA": {
"MEDIA_ID": "only_nodes rabbit hole",
"DISPLAY_TITLE": "Rabbit hole 2"
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/MediaKeys.java b/TestMediaApp/src/com/android/car/media/testmediaapp/MediaKeys.java
index 9c58483..9fba1a8 100644
--- a/TestMediaApp/src/com/android/car/media/testmediaapp/MediaKeys.java
+++ b/TestMediaApp/src/com/android/car/media/testmediaapp/MediaKeys.java
@@ -65,4 +65,18 @@ public class MediaKeys {
* hints the corresponding items should be presented as grids.
*/
static final int CONTENT_STYLE_GRID_ITEM_HINT_VALUE = 2;
+
+ /**
+ * Value for {@link #CONTENT_STYLE_BROWSABLE_HINT} that hints the corresponding items should be
+ * presented as a "category" list, where media items are browsable and represented by a
+ * meaningful icon.
+ */
+ public static final int CONTENT_STYLE_CATEGORY_LIST_ITEM_HINT_VALUE = 3;
+
+ /**
+ * Value for {@link #CONTENT_STYLE_BROWSABLE_HINT} that hints the corresponding items should be
+ * presented as a "category" grid, where media items are browsable and represented by a
+ * meaningful icon.
+ */
+ public static final int CONTENT_STYLE_CATEGORY_GRID_ITEM_HINT_VALUE = 4;
}
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaMediaItem.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaMediaItem.java
index f79e273..af1b2e3 100644
--- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaMediaItem.java
+++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaMediaItem.java
@@ -42,7 +42,9 @@ public class TmaMediaItem {
public enum ContentStyle {
NONE (0),
LIST (MediaKeys.CONTENT_STYLE_LIST_ITEM_HINT_VALUE),
- GRID (MediaKeys.CONTENT_STYLE_GRID_ITEM_HINT_VALUE);
+ GRID (MediaKeys.CONTENT_STYLE_GRID_ITEM_HINT_VALUE),
+ LIST_CATEGORY(MediaKeys.CONTENT_STYLE_CATEGORY_LIST_ITEM_HINT_VALUE),
+ GRID_CATEGORY(MediaKeys.CONTENT_STYLE_CATEGORY_GRID_ITEM_HINT_VALUE);
final int mBundleValue;
ContentStyle(int value) {
mBundleValue = value;