diff options
| author | Arnaud Berry <arnaudberry@google.com> | 2019-08-05 10:40:12 -0700 |
|---|---|---|
| committer | Arnaud Berry <arnaudberry@google.com> | 2019-08-08 13:42:25 -0700 |
| commit | eb22c0abe7bf08ea0270398523ab51c108d40482 (patch) | |
| tree | 40fc41c39b7eac6a842e36a3a1425a08e9725af8 /TestMediaApp/src | |
| parent | 5985c24b9765ddc756bf301d05d6b3e6b32db2d3 (diff) | |
| download | tests-eb22c0abe7bf08ea0270398523ab51c108d40482.tar.gz | |
Support resource uris and use them for some media items
Also add a rectangular vector icon.
Test: manual
Change-Id: I2bce9136310f5bfad8f061e15a72995e9152af9c
Diffstat (limited to 'TestMediaApp/src')
| -rw-r--r-- | TestMediaApp/src/com/android/car/media/testmediaapp/TmaAssetProvider.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaAssetProvider.java b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaAssetProvider.java index ca72fde..15406a3 100644 --- a/TestMediaApp/src/com/android/car/media/testmediaapp/TmaAssetProvider.java +++ b/TestMediaApp/src/com/android/car/media/testmediaapp/TmaAssetProvider.java @@ -16,6 +16,7 @@ package com.android.car.media.testmediaapp; import android.content.ContentProvider; +import android.content.ContentResolver; import android.content.ContentValues; import android.content.res.AssetFileDescriptor; import android.database.Cursor; @@ -30,15 +31,24 @@ public class TmaAssetProvider extends ContentProvider { private static final String TAG = "TmaAssetProvider"; - private static final String URI_PREFIX = "content://com.android.car.media.testmediaapp.assets/"; + private static final String PACKAGE_NAME = "com.android.car.media.testmediaapp"; + private static final String ASSET_URI_PREFIX = + ContentResolver.SCHEME_CONTENT + "://" + PACKAGE_NAME + ".assets/"; - public static String buildUriString(String localAssetFilePath) { - return URI_PREFIX + localAssetFilePath; + private static final String RESOURCE_URI_PREFIX = + ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + PACKAGE_NAME + "/"; + + + public static String buildUriString(String localArt) { + String prefix = localArt.startsWith("drawable") ? RESOURCE_URI_PREFIX : ASSET_URI_PREFIX; + return prefix + localArt; } @Override public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException { + Log.i(TAG, "TmaAssetProvider#openAssetFile " + uri); + String file_path = uri.getPath(); if (TextUtils.isEmpty(file_path)) throw new FileNotFoundException(); try { |