diff options
| author | Simon Dai <sdai@google.com> | 2019-11-08 14:04:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-08 14:04:45 -0800 |
| commit | 62a4ce19dede2f7c5fef12e0d52f9b128972e980 (patch) | |
| tree | eefe3d610d4a5baac107fd5a4af17acc37c65d02 | |
| parent | 2a51a0a6b4379a40690cfac69c1453927a94b704 (diff) | |
| parent | aa2e4d96becbbf5ccdaa4951dbf8330ef0808398 (diff) | |
| download | tests-62a4ce19dede2f7c5fef12e0d52f9b128972e980.tar.gz | |
Merge "Add untagged root node type as error case" into pi-car-dev am: d691f98478 am: ea4fe4258b am: 501b088a14
am: aa2e4d96be
Change-Id: I53bfaa1fc5b4413b6b34ec6c2c2d32311f494c98
3 files changed, 30 insertions, 1 deletions
diff --git a/TestMediaApp/assets/media_items/untagged.json b/TestMediaApp/assets/media_items/untagged.json new file mode 100644 index 0000000..fd8f5f5 --- /dev/null +++ b/TestMediaApp/assets/media_items/untagged.json @@ -0,0 +1,27 @@ +{ + "FLAGS": "browsable", + + "METADATA": { + "MEDIA_ID": "untagged", + "DISPLAY_TITLE": "Untagged media items" + }, + + "CHILDREN": [ + { + "METADATA": { + "MEDIA_ID": "untagged normal 10s song", + "DISPLAY_TITLE": "A normal 10s song with a long title. A normal 10s song with a long title. A normal 10s song with a long title. ", + "DURATION": 10000 + } + }, + { + "METADATA": { + "MEDIA_ID": "untagged normal 1H song", + "DISPLAY_TITLE": "A normal 1H song", + "ARTIST": "Artist", + "ALBUM":"Album", + "DURATION": 3600000 + } + } + ] +} diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java index 8bda24d..327a2b6 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaLibrary.java @@ -53,6 +53,7 @@ class TmaLibrary { mRootAssetPaths.put(TmaBrowseNodeType.NODE_CHILDREN, "media_items/only_nodes.json"); mRootAssetPaths.put(TmaBrowseNodeType.LEAF_CHILDREN, "media_items/simple_leaves.json"); mRootAssetPaths.put(TmaBrowseNodeType.MIXED_CHILDREN, "media_items/mixed.json"); + mRootAssetPaths.put(TmaBrowseNodeType.UNTAGGED, "media_items/untagged.json"); } @Nullable diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/prefs/TmaEnumPrefs.java b/TestMediaApp/src/com/android/car/media/testmediaapp/prefs/TmaEnumPrefs.java index 347e52c..3702929 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/prefs/TmaEnumPrefs.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/prefs/TmaEnumPrefs.java @@ -87,7 +87,8 @@ public class TmaEnumPrefs { SINGLE_TAB("Single browse-able tab", "single-tab"), NODE_CHILDREN("Only browse-able content", "nodes"), LEAF_CHILDREN("Only playable content (basic working and error cases)", "leaves"), - MIXED_CHILDREN("Mixed content (apps are not supposed to do that)", "mixed"); + MIXED_CHILDREN("Mixed content (apps are not supposed to do that)", "mixed"), + UNTAGGED("Untagged media items (not playable or browsable)", "untagged"); private final PrefValueImpl mPrefValue; |