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

Commit fe9f12d3 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Themable volume and power dialogs" into oc-dr1-dev am: 59aadea8 

am: a35d4bc6

Change-Id: I949028d0efda4b01141346bb008b32eed8cb4a76
parents f4b161b1 a35d4bc6

packages/SystemUI/res/drawable/rounded_bg.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

       android:shape="rectangle">

    <solid android:color="#ffffffff" />

    <solid android:color="?android:attr/colorPrimary" />

    <corners

    <corners

        android:bottomLeftRadius="@dimen/corner_size"

        android:bottomLeftRadius="@dimen/corner_size"

        android:topLeftRadius="@dimen/corner_size"

        android:topLeftRadius="@dimen/corner_size"

packages/SystemUI/res/drawable/rounded_bg_bottom.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

       android:shape="rectangle">

    <solid android:color="#ffeeeeee" />

    <solid android:color="?android:attr/colorPrimaryDark" />

    <corners

    <corners

        android:bottomLeftRadius="@dimen/corner_size"

        android:bottomLeftRadius="@dimen/corner_size"

        android:topLeftRadius="0dp"

        android:topLeftRadius="0dp"

packages/SystemUI/res/drawable/rounded_bg_full.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

       android:shape="rectangle">

    <solid android:color="#ffffffff" />

    <solid android:color="?android:attr/colorPrimary" />

    <corners

    <corners

        android:bottomLeftRadius="@dimen/corner_size"

        android:bottomLeftRadius="@dimen/corner_size"

        android:topLeftRadius="@dimen/corner_size"

        android:topLeftRadius="@dimen/corner_size"

packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

       android:shape="rectangle">

    <solid android:color="#ffeeeeee" />

    <solid android:color="?android:attr/colorPrimaryDark" />

    <corners

    <corners

        android:bottomLeftRadius="@dimen/corner_size"

        android:bottomLeftRadius="@dimen/corner_size"

        android:topLeftRadius="0dp"

        android:topLeftRadius="0dp"

packages/SystemUI/res/drawable/volume_dialog_background.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,5 +14,5 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android" >

<shape xmlns:android="http://schemas.android.com/apk/res/android" >

    <solid android:color="?android:attr/colorPrimary" />

    <solid android:color="?android:attr/colorBackgroundFloating" />

</shape>
 
</shape>
 
 No newline at end of file