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

Commit e2f14882 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Create a new config for attentional haptics OGG resource" into sc-dev am: c7aa640d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14253109

Change-Id: I08bbaeafb172c74d58cf2b5b08ff1ac7e4a71ed2
parents 11f386e9 c7aa640d

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3971,6 +3971,9 @@ 
    <!-- URI for in call notification sound -->

    <string translatable="false" name="config_inCallNotificationSound">/product/media/audio/ui/InCallNotification.ogg</string>



    <!-- URI for default ringtone sound file to be used for silent ringer vibration -->

    <string translatable="false" name="config_defaultRingtoneVibrationSound">/product/media/audio/ui/AttentionalHaptics.ogg</string>



    <!-- Default number of notifications from the same app before they are automatically grouped by the OS -->

    <integer translatable="false" name="config_autoGroupAtCount">4</integer>

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -3236,6 +3236,8 @@ 
    <public name="config_systemCompanionDeviceProvider"/>

    <!-- @hide @SystemApi -->

    <public name="config_systemUi" />

    <!-- @hide For use by platform and tools only. Developers should not specify this value. -->

    <public name="config_defaultRingtoneVibrationSound"/>

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01020055">

media/java/android/media/Ringtone.java

+5 −3
Original line number Diff line number Diff line
@@ -405,9 +405,11 @@ public class Ringtone { 
     */

    public void play() {

        if (mLocalPlayer != null) {

            // do not play ringtones if stream volume is 0

            // (typically because ringer mode is silent).

            if (mAudioManager.getStreamVolume(

            // Play ringtones if stream volume is over 0 or if it is a haptic-only ringtone

            // (typically because ringer mode is vibrate).

            boolean isHapticOnly = AudioManager.hasHapticChannels(mUri)

                    && !mAudioAttributes.areHapticChannelsMuted() && mVolume == 0;

            if (isHapticOnly || mAudioManager.getStreamVolume(

                    AudioAttributes.toLegacyStreamType(mAudioAttributes)) != 0) {

                startLocalPlayer();

            }