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

Commit f15ef112 authored by John Spurlock's avatar John Spurlock
Browse files

Volume: Update media bluetooth icons. 

Note + bt logo.

Bug: 19260237
Change-Id: I32cb497505f7dea94d761637064f8f8e585ffa94
parent 64985063

packages/SystemUI/res/drawable/ic_volume_bt.xml→packages/SystemUI/res/drawable/ic_volume_media_bt.xml

+9 −6
Original line number Original line Diff line number Diff line
@@ -14,13 +14,16 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

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

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

    android:height="24dp"

    android:width="24.0dp"

    android:viewportHeight="48.0"

    android:height="24.0dp"

    android:viewportWidth="48.0"

    android:viewportWidth="24.0"

    android:width="24dp" >

    android:viewportHeight="24.0">





    <path

    <path

        android:fillColor="@color/volume_icon_color"

        android:fillColor="@color/volume_icon_color"

        android:pathData="M35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6z" />

        android:pathData="M17.0,3.0l-7.0,0.0l0.0,9.3C9.5,12.1 9.0,12.0 8.5,12.0C6.0,12.0 4.0,14.0 4.0,16.5S6.0,21.0 8.5,21.0s4.5,-2.3 4.5,-4.5C13.0,14.7 13.0,6.0 13.0,6.0l4.0,0.0L17.0,3.0z"/>

    <path

        android:fillColor="@color/volume_icon_color"

        android:pathData="M23.4,9.9L20.5,7.0L20.0,7.0l0.0,3.8l-2.3,-2.3L17.0,9.2l2.8,2.8L17.0,14.8l0.7,0.7l2.3,-2.3L20.0,17.0l0.5,0.0l2.8,-2.8L21.2,12.0L23.4,9.9zM21.0,8.9l0.9,0.9l-0.9,1.0L21.0,8.9zM21.9,14.2L21.0,15.1l0.0,-1.9L21.9,14.2z"/>





</vector>
 
</vector>

packages/SystemUI/res/drawable/ic_volume_bt_mute.xml→packages/SystemUI/res/drawable/ic_volume_media_bt_mute.xml

+9 −3
Original line number Original line Diff line number Diff line
@@ -15,12 +15,18 @@ 
-->

-->

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

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

    android:height="24dp"

    android:height="24dp"

    android:viewportHeight="48.0"

    android:viewportHeight="24.0"

    android:viewportWidth="48.0"

    android:viewportWidth="24.0"

    android:width="24dp" >

    android:width="24dp" >





    <path

    <path

        android:fillColor="@color/volume_icon_color"

        android:fillColor="@color/volume_icon_color"

        android:pathData="M26.0,11.8l3.8,3.8l-3.2,3.2l2.8,2.8l6.0,-6.0L24.0,4.2l-2.0,0.0l0.0,10.1l4.0,4.0L26.0,11.8zM10.8,8.2L8.0,11.0l13.2,13.2L10.0,35.3l2.8,2.8L22.0,29.0l0.0,15.2l2.0,0.0l8.6,-8.6l4.6,4.6l2.8,-2.8L10.8,8.2zM26.0,36.5L26.0,29.0l3.8,3.8L26.0,36.5z" />

        android:pathData="M13.0,6.0l4.0,0.0L17.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C13.0,8.8 13.0,6.0 13.0,6.0z"/>

    <path

        android:fillColor="@color/volume_icon_color"

        android:pathData="M2.1,5.7L8.4,12.0C6.0,12.1 4.0,14.0 4.0,16.5S6.0,21.0 8.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3l0.0,-0.1l3.9,3.9l1.3,-1.3L3.4,4.5L2.1,5.7z"/>

    <path

        android:fillColor="@color/volume_icon_color"

        android:pathData="M23.4,9.9L20.5,7.0L20.0,7.0l0.0,3.8l-2.3,-2.3L17.0,9.2l2.8,2.8L17.0,14.8l0.7,0.7l2.3,-2.3L20.0,17.0l0.5,0.0l2.8,-2.8L21.2,12.0L23.4,9.9zM21.0,8.9l0.9,0.9l-0.9,1.0L21.0,8.9zM21.9,14.2L21.0,15.1l0.0,-1.9L21.9,14.2z"/>





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

packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -700,7 +700,8 @@ public class VolumeDialog { 
        final int iconRes =

        final int iconRes =

                isRingVibrate ? R.drawable.ic_volume_ringer_vibrate

                isRingVibrate ? R.drawable.ic_volume_ringer_vibrate

                : ss.routedToBluetooth ?

                : ss.routedToBluetooth ?

                        (ss.muted ? R.drawable.ic_volume_bt_mute : R.drawable.ic_volume_bt)

                        (ss.muted ? R.drawable.ic_volume_media_bt_mute

                                : R.drawable.ic_volume_media_bt)

                : mAutomute && ss.level == 0 ? row.iconMuteRes

                : mAutomute && ss.level == 0 ? row.iconMuteRes

                : (ss.muted ? row.iconMuteRes : row.iconRes);

                : (ss.muted ? row.iconMuteRes : row.iconRes);

        if (iconRes != row.cachedIconRes) {

        if (iconRes != row.cachedIconRes) {
@@ -712,9 +713,9 @@ public class VolumeDialog { 
        }

        }

        row.iconState =

        row.iconState =

                iconRes == R.drawable.ic_volume_ringer_vibrate ? Events.ICON_STATE_VIBRATE

                iconRes == R.drawable.ic_volume_ringer_vibrate ? Events.ICON_STATE_VIBRATE

                : (iconRes == R.drawable.ic_volume_bt_mute || iconRes == row.iconMuteRes)

                : (iconRes == R.drawable.ic_volume_media_bt_mute || iconRes == row.iconMuteRes)

                        ? Events.ICON_STATE_MUTE

                        ? Events.ICON_STATE_MUTE

                : (iconRes == R.drawable.ic_volume_bt || iconRes == row.iconRes)

                : (iconRes == R.drawable.ic_volume_media_bt || iconRes == row.iconRes)

                        ? Events.ICON_STATE_UNMUTE

                        ? Events.ICON_STATE_UNMUTE

                : Events.ICON_STATE_UNKNOWN;

                : Events.ICON_STATE_UNKNOWN;