Merge "Revert "Allow remote URIs, change tinting to transparent"" into pi-car-dev
am: 3cfeb8d056
Change-Id: Idc76eac7a6d2fdd5e9367000a9ebb78a3906abd0
diff --git a/car-media-common/res/values/bools.xml b/car-media-common/res/values/bools.xml
index 69ce565..f1f45fe 100644
--- a/car-media-common/res/values/bools.xml
+++ b/car-media-common/res/values/bools.xml
@@ -22,7 +22,6 @@
art (see MediaItemMetadata and MediaButtonController).
The same effect can be achieved with: adb shell setprop log.tag.MediaItemFlagInvalidArt 1
-->
- <!-- STOPSHIP(sdai) set this value back to false -->
- <bool name="flag_invalid_media_art">true</bool>
+ <bool name="flag_invalid_media_art">false</bool>
</resources>
diff --git a/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java b/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java
index 19e7a61..b3c9841 100644
--- a/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java
+++ b/car-media-common/src/com/android/car/media/common/MediaItemMetadata.java
@@ -73,8 +73,7 @@
* Or set R.bool.flag_invalid_media_art to true.
*/
static final String FLAG_INVALID_MEDIA_ART_KEY = "com.android.car.media.FlagInvalidArt";
- // STOPSHIP(sdai) Fix tint color alpha - set to 200
- static final int INVALID_MEDIA_ART_TINT_COLOR = Color.argb(0, 255, 0, 0);
+ static final int INVALID_MEDIA_ART_TINT_COLOR = Color.argb(200, 255, 0, 0);
private static Boolean sFlagNonLocalMediaArt;