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

Commit 89c4963f authored by Angela Wang's avatar Angela Wang
Browse files

Add background to ambient volume control icons 

Enhance the visibility and discoverability of ambient volume control
icons by adding backgrounds.

Flag: EXEMPT bugfix
Bug: 398962101
Test: manual check the result and screenshots attached on bug
Change-Id: I2ffe6dee706475074a1be08e0ef25081a52d5083
parent c80fd5d2

packages/SystemUI/res/drawable/hearing_device_ambient_expand_icon_background.xml

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

<!--

     Copyright (C) 2025 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.

-->



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

    android:drawable="@drawable/hearing_device_ambient_icon_background"

    android:insetTop="10dp"

    android:insetBottom="10dp"/>

packages/SystemUI/res/drawable/hearing_device_ambient_icon_background.xml

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

<!--

     Copyright (C) 2025 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">

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />

    <corners

        android:bottomLeftRadius="?android:attr/dialogCornerRadius"

        android:topLeftRadius="?android:attr/dialogCornerRadius"

        android:bottomRightRadius="?android:attr/dialogCornerRadius"

        android:topRightRadius="?android:attr/dialogCornerRadius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/hearing_device_ambient_volume_layout.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,8 @@ 
            android:padding="12dp"

            android:padding="12dp"

            android:contentDescription="@string/hearing_devices_ambient_unmute"

            android:contentDescription="@string/hearing_devices_ambient_unmute"

            android:src="@drawable/ic_ambient_volume"

            android:src="@drawable/ic_ambient_volume"

            android:tint="@androidprv:color/materialColorOnSurface" />

            android:tint="@androidprv:color/materialColorOnSurface"

            android:background="@drawable/hearing_device_ambient_icon_background"/>

        <TextView

        <TextView

            android:id="@+id/ambient_title"

            android:id="@+id/ambient_title"

            android:layout_width="0dp"

            android:layout_width="0dp"
@@ -56,7 +57,8 @@ 
            android:padding="10dp"

            android:padding="10dp"

            android:contentDescription="@string/hearing_devices_ambient_expand_controls"

            android:contentDescription="@string/hearing_devices_ambient_expand_controls"

            android:src="@drawable/ic_hearing_device_expand"

            android:src="@drawable/ic_hearing_device_expand"

            android:tint="@androidprv:color/materialColorOnSurface" />

            android:tint="@androidprv:color/materialColorOnSurface"

            android:background="@drawable/hearing_device_ambient_expand_icon_background"/>

    </LinearLayout>

    </LinearLayout>

    <LinearLayout

    <LinearLayout

        android:id="@+id/ambient_control_container"

        android:id="@+id/ambient_control_container"