Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b540e47 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove use of androidprv to work around a bug in sysyui studio build"... 

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

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

Change-Id: I3946a957f13dbf107525e2eabd7853c02f57bf51
parents 7700d5c4 4b419f08

packages/SystemUI/res/color/media_player_album_bg.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?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

packages/SystemUI/res/color/media_player_outline_button_bg.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?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

packages/SystemUI/res/values/styles.xml

+4 −4
Original line number Diff line number Diff line
@@ -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>