From 546f6c496263932b1551bd7e27c59b41d41c5e51 Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Fri, 7 May 2021 10:22:43 -0400
Subject: [PATCH] Remove use of androidprv to work around a bug in sysyui
 studio build

Fixes: 187506380
Test: build with gradle
Change-Id: I360f3d5101cddf73dbce488d9e0e860c96ee1583
---
 packages/SystemUI/res/color/media_player_album_bg.xml     | 5 +++++
 .../SystemUI/res/color/media_player_outline_button_bg.xml | 5 +++++
 packages/SystemUI/res/values/styles.xml                   | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 packages/SystemUI/res/color/media_player_album_bg.xml
 create mode 100644 packages/SystemUI/res/color/media_player_outline_button_bg.xml

diff --git a/packages/SystemUI/res/color/media_player_album_bg.xml b/packages/SystemUI/res/color/media_player_album_bg.xml
new file mode 100644
index 0000000000000..e0deac9731390
--- /dev/null
+++ b/packages/SystemUI/res/color/media_player_album_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+    <item android:color="?androidprv:attr/colorAccentSecondary"/>
+</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/color/media_player_outline_button_bg.xml b/packages/SystemUI/res/color/media_player_outline_button_bg.xml
new file mode 100644
index 0000000000000..ba7848a5d23ea
--- /dev/null
+++ b/packages/SystemUI/res/color/media_player_outline_button_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+ <item android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
+</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 7db9decbe78a7..9fd18c6259574 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- NOTE: Adding the androidprv: namespace to this file will break the studio build. -->
     <style name="ClearAllButtonDefaultMargins">
         <item name="android:layout_marginStart">0dp</item>
         <item name="android:layout_marginTop">0dp</item>
@@ -644,7 +644,7 @@
     <style name="MediaPlayer.OutlineButton">
         <item name="android:background">@drawable/qs_media_button_background</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:backgroundTint">?androidprv:attr/colorAccentPrimaryVariant</item>
+        <item name="android:backgroundTint">@color/media_player_outline_button_bg</item>
         <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
     </style>
 
@@ -661,7 +661,7 @@
     </style>
 
     <style name="MediaPlayer.Album">
-        <item name="android:backgroundTint">?androidprv:attr/colorAccentSecondary</item>
+        <item name="android:backgroundTint">@color/media_player_album_bg</item>
 
     </style>