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

Commit 75ffd61e authored by Antony Sargent's avatar Antony Sargent Committed by android-build-merger
Browse files

Merge "Update sound settings icons" into pi-dev 

am: 2e0709b3

Change-Id: Ic6f6658698e824b4eb99799b5c5146c3311a99d4
parents ef757358 2e0709b3

res/drawable/ic_media_stream_off.xml

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

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

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M21.19,21.19L14,14l-2,-2l-9.2,-9.2L1.39,4.22l8.79,8.79c-0.06,0 -0.12,-0.01 -0.18,-0.01C7.79,13 6,14.79 6,17c0,2.21 1.79,4 4.01,4S14,19.21 14,17v-0.17l5.78,5.78L21.19,21.19zM10.01,19c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C12.01,18.1 11.11,19 10.01,19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M14,11.17l0,-4.17l4,0l0,-4l-6,0l0,6.17z"/>

</vector>

res/xml/sound_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <!-- Media volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="media_volume"

        android:icon="@*android:drawable/ic_audio_media"

        android:icon="@drawable/ic_media_stream"

        android:title="@string/media_volume_option_title"

        android:order="-180"

        settings:controller="com.android.settings.notification.MediaVolumePreferenceController"/>
@@ -57,7 +57,7 @@ 
    <!-- Ring volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="ring_volume"

        android:icon="@*android:drawable/ic_audio_ring_notif"

        android:icon="@drawable/ic_notifications"

        android:title="@string/ring_volume_option_title"

        android:order="-160"

        settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
@@ -73,7 +73,7 @@ 
    <!-- Notification volume -->

    <com.android.settings.notification.VolumeSeekBarPreference

        android:key="notification_volume"

        android:icon="@*android:drawable/ic_audio_ring_notif"

        android:icon="@drawable/ic_notifications"

        android:title="@string/notification_volume_option_title"

        android:order="-140"

        settings:controller="com.android.settings.notification.NotificationVolumePreferenceController"/>

src/com/android/settings/notification/MediaVolumePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -55,6 +55,6 @@ public class MediaVolumePreferenceController extends 


    @Override

    public int getMuteIcon() {

        return com.android.internal.R.drawable.ic_audio_media_mute;

        return R.drawable.ic_media_stream_off;

    }

}

src/com/android/settings/notification/NotificationVolumePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class NotificationVolumePreferenceController extends 


    @Override

    public int getMuteIcon() {

        return com.android.internal.R.drawable.ic_audio_ring_notif_mute;

        return R.drawable.ic_notifications_off_24dp;

    }



}

src/com/android/settings/notification/RingVolumePreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -126,12 +126,12 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr 
        if (mPreference != null) {

            if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {

                mMuteIcon = R.drawable.ic_volume_ringer_vibrate;

                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);

                mPreference.showIcon(R.drawable.ic_volume_ringer_vibrate);

            } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {

                mMuteIcon = R.drawable.ic_notifications_off_24dp;

                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_mute);

                mPreference.showIcon(R.drawable.ic_notifications_off_24dp);

            } else {

                mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif);

                mPreference.showIcon(R.drawable.ic_notifications);

            }

        }

    }