Snap for 5706892 from a1863280183008deeb1b6ce026a680266f944669 to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r1android10-mainline-release

Change-Id: I6e1d19d001b306d92d6b617b6791a8194e728804

3 files changed, 44 insertions, 4 deletions

diff --git a/TestMediaApp/assets/media_items/advanced.json b/TestMediaApp/assets/media_items/advanced.json
new file mode 100644
index 0000000..4cf34ea
--- /dev/null
+++ b/TestMediaApp/assets/media_items/advanced.json
@@ -0,0 +1,29 @@
+{
+  "FLAGS": "browsable",
+
+  "METADATA": {
+    "MEDIA_ID": "advanced",
+    "DISPLAY_TITLE": "Advanced"
+  },
+
+  "CHILDREN": [
+    {
+      "FLAGS": "playable",
+      "METADATA": {
+        "MEDIA_ID": "advanced custom_action",
+        "DISPLAY_TITLE": "Custom Action",
+        "DURATION": 10000
+      },
+      "CUSTOM_ACTIONS": ["HEART_LESS_LESS", "HEART_PLUS_PLUS"]
+    },
+    {
+      "FLAGS": "browsable",
+      "PLAYABLE_HINT": "GRID",
+      "METADATA": {
+        "MEDIA_ID": "advanced art nodes",
+        "DISPLAY_TITLE": "Album Art"
+      },
+      "INCLUDE":"media_items/album_art/art_nodes.json"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/TestMediaApp/assets/media_items/mixed.json b/TestMediaApp/assets/media_items/mixed.json
index 872fa4f..7e04e85 100644
--- a/TestMediaApp/assets/media_items/mixed.json
+++ b/TestMediaApp/assets/media_items/mixed.json
@@ -36,6 +36,16 @@
     {
       "FLAGS": "browsable",
       "PLAYABLE_HINT": "LIST",
+      "BROWSABLE_HINT": "LIST",
+      "METADATA": {
+        "MEDIA_ID": "mixed advanced",
+        "DISPLAY_TITLE": "Advanced"
+      },
+      "INCLUDE":"media_items/advanced.json"
+    },
+    {
+      "FLAGS": "browsable",
+      "PLAYABLE_HINT": "LIST",
       "BROWSABLE_HINT": "GRID",
       "METADATA": {
         "MEDIA_ID": "mixed rabbit hole",
diff --git a/TestMediaApp/assets/media_items/only_nodes.json b/TestMediaApp/assets/media_items/only_nodes.json
index 7150104..4858438 100644
--- a/TestMediaApp/assets/media_items/only_nodes.json
+++ b/TestMediaApp/assets/media_items/only_nodes.json
@@ -19,12 +19,13 @@
     },
     {
       "FLAGS": "browsable",
-      "PLAYABLE_HINT": "GRID",
+      "PLAYABLE_HINT": "LIST",
+      "BROWSABLE_HINT": "LIST",
       "METADATA": {
-        "MEDIA_ID": "only_nodes art nodes",
-        "DISPLAY_TITLE": "Album Art"
+        "MEDIA_ID": "only_nodes advanced",
+        "DISPLAY_TITLE": "Advanced"
       },
-      "INCLUDE":"media_items/album_art/art_nodes.json"
+      "INCLUDE":"media_items/advanced.json"
     },
     {
       "FLAGS": "browsable",