Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove use of androidprv to work around a bug in sysyui studio build" into sc-dev am: 4b419f08d5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14456378

Change-Id: I3946a957f13dbf107525e2eabd7853c02f57bf51
This commit is contained in:
Jeff DeCew
2021-05-07 19:11:47 +00:00
committed by Automerger Merge Worker
parent 7700d5c4d1 4b419f08d5
commit 3b540e4793
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/color/media_player_album_bg.xml Normal file
View File

@@ -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>

5
packages/SystemUI/res/color/media_player_outline_button_bg.xml Normal file
View File

@@ -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>

8
packages/SystemUI/res/values/styles.xml
View File

@@ -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>
@@ -642,7 +642,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>
@@ -659,7 +659,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>