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

Commit bb1810c4 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Fork volume_dialog.xml for the BC25 update" into main

parents ea5bd2a6 840cb839

packages/SystemUI/res/drawable/volume_dialog_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

    Copyright (C) 2024 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <corners android:radius="@dimen/volume_dialog_background_corner_radius" />

    <solid android:color="?androidprv:attr/materialColorSurface" />

</shape>

packages/SystemUI/res/drawable/volume_dialog_floating_slider_background.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <corners android:radius="20dp" />

    <solid android:color="?androidprv:attr/colorSurface" />

</shape>

packages/SystemUI/res/drawable/volume_dialog_floating_sliders_spacer.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

    Copyright (C) 2024 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    android:shape="rectangle">

    <size

        android:width="@dimen/volume_dialog_floating_sliders_spacing"

        android:height="@dimen/volume_dialog_floating_sliders_spacing" />

    <solid android:color="@color/transparent" />

</shape>

packages/SystemUI/res/drawable/volume_dialog_spacer.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

    Copyright (C) 2024 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



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

    android:shape="rectangle">

    <size

        android:width="@dimen/volume_dialog_spacing"

        android:height="@dimen/volume_dialog_spacing" />

    <solid android:color="@color/transparent" />

</shape>

packages/SystemUI/res/drawable/volume_row_seekbar_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:autoMirrored="true">

    <item android:id="@+id/volume_seekbar_progress_solid">

        <shape>

            <size android:height="@dimen/volume_dialog_slider_width" />

            <size android:height="@dimen/volume_dialog_slider_width_legacy" />

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

            <corners android:radius="@dimen/volume_dialog_slider_corner_radius"/>

        </shape>